OSDN Git Service
Michael Niedermayer [Fri, 22 Mar 2013 22:18:26 +0000 (23:18 +0100)]
Changelog: add WebP
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 22 Mar 2013 08:54:06 +0000 (09:54 +0100)]
lavfi/blend: always peek the first frame of each queue.
Before the change, filter_frame() always waited for 2 samples in the
bottom frames queue. This notably fixes commands such as
./ffplay tests/lena.pnm -vf split,blend=c0_mode=addition
Clément Bœsch [Fri, 22 Mar 2013 18:56:39 +0000 (19:56 +0100)]
lavc/prores: restore pict_type and key_frame setting.
Michael Niedermayer [Fri, 22 Mar 2013 21:57:23 +0000 (22:57 +0100)]
x86/mpegvideo: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Mar 2013 21:57:08 +0000 (22:57 +0100)]
x86/h264_qpel: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 22 Mar 2013 20:37:17 +0000 (21:37 +0100)]
Fix typo in dvvideo decoder dependencies.
Fixes compilation with --disable-everything --enable-decoder=dvvideo
Michael Niedermayer [Fri, 22 Mar 2013 17:07:26 +0000 (18:07 +0100)]
h263dec: switch to av_assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Mar 2013 17:04:17 +0000 (18:04 +0100)]
matroskadec: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Mar 2013 10:38:46 +0000 (11:38 +0100)]
vp8: WebP decoding support
VP8L, padding and bounds checks by Pascal Massimino
Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Mar 2013 02:42:35 +0000 (03:42 +0100)]
img2: WebP support
Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 22 Mar 2013 12:32:35 +0000 (13:32 +0100)]
Fix compilation with --disable-everything --enable-parser=h264.
Carl Eugen Hoyos [Fri, 22 Mar 2013 11:00:26 +0000 (12:00 +0100)]
Fix compilation with --disable-mmx.
Michael Niedermayer [Fri, 22 Mar 2013 11:52:05 +0000 (12:52 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Enable hwaccels without external dependencies by default.
doc/developer: Clarify symbol naming prefixes section.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 22 Mar 2013 00:47:49 +0000 (01:47 +0100)]
lavu/eval: add between() function.
Carl Eugen Hoyos [Fri, 22 Mar 2013 00:03:07 +0000 (01:03 +0100)]
Do not fail in get_buffer_internal() if pix_fmt planes == 0.
Fixes VDPAU decoding, reported by Ilja Sekler
Michael Niedermayer [Thu, 21 Mar 2013 22:32:37 +0000 (23:32 +0100)]
error_resilience: fix const correctness, silence warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Mar 2013 22:25:45 +0000 (23:25 +0100)]
vdpau.h: change vdpau_render_state layout to match fork if AV_HAVE_INCOMPATIBLE_FORK_ABI
This might fix a compatibility issue.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrew Euell [Thu, 21 Mar 2013 18:16:44 +0000 (14:16 -0400)]
vda_h264: fix for VDA compile
the VDA code needs to be updated to use the CHROMA(h) macros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 15:00:35 +0000 (16:00 +0100)]
sonicdec: update to new buffer API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 14:49:22 +0000 (15:49 +0100)]
sonicenc: fix mono decorrelation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 14:46:16 +0000 (15:46 +0100)]
sonicdec: fix frame size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 14:45:59 +0000 (15:45 +0100)]
sonicdec: check decorrelation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 13:48:16 +0000 (14:48 +0100)]
g729dec: switch to buffer refs style
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 13:43:09 +0000 (14:43 +0100)]
v308dec: remove unneeded self assignment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 18 Mar 2013 21:27:03 +0000 (22:27 +0100)]
configure: Enable hwaccels without external dependencies by default.
Diego Biurrun [Sat, 16 Mar 2013 23:57:12 +0000 (00:57 +0100)]
doc/developer: Clarify symbol naming prefixes section.
Michael Niedermayer [Thu, 21 Mar 2013 12:54:04 +0000 (13:54 +0100)]
ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with yadif injection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 12:17:55 +0000 (13:17 +0100)]
h264: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 12:17:19 +0000 (13:17 +0100)]
h264: add an argument to CHROMA for consistency
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 12:10:50 +0000 (13:10 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: remove redundant freeing of DPB in h264_decode_end
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 12:06:14 +0000 (13:06 +0100)]
Merge commit '
23e85be58fc64b2e804e68b0034a08a6d257e523'
* commit '
23e85be58fc64b2e804e68b0034a08a6d257e523':
h264: add a parameter to the CHROMA444 macro.
h264: add a parameter to the CHROMA422 macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 11:58:00 +0000 (12:58 +0100)]
Merge commit '
6d2b6f21eb45ffbda1103c772060303648714832'
* commit '
6d2b6f21eb45ffbda1103c772060303648714832':
h264: add a parameter to the CABAC macro.
h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 11:50:18 +0000 (12:50 +0100)]
Merge commit '
7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'
* commit '
7fa00653a550c0d24b3951c0f9fed6350ecf5ce4':
h264: add a parameter to the FIELD_PICTURE macro.
h264: add a parameter to the FRAME_MBAFF macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 11:43:32 +0000 (12:43 +0100)]
Merge commit '
da6be8fcec16a94d8084bda8bb8a0a411a96bcf7'
* commit '
da6be8fcec16a94d8084bda8bb8a0a411a96bcf7':
h264: add a parameter to the MB_FIELD macro.
h264: add a parameter to the MB_MBAFF macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 11:34:59 +0000 (12:34 +0100)]
Merge commit '
48d0fd2d62a476e1db9298163f1fc0abae26cc67'
* commit '
48d0fd2d62a476e1db9298163f1fc0abae26cc67':
h264: merge common_init() into ff_h264_decode_init.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 11:05:13 +0000 (12:05 +0100)]
Merge commit '
25408b2a0660c1e6c8555559c4ed71dff2ede31e'
* commit '
25408b2a0660c1e6c8555559c4ed71dff2ede31e':
h264: make ff_h264_frame_start static.
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 10:56:15 +0000 (11:56 +0100)]
Merge commit '
1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5'
* commit '
1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5':
fate: add tests for h264 decoder reinit
h264: fix bit depth changes with frame threading
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Mar 2013 10:51:26 +0000 (11:51 +0100)]
h264: drop special case for 9bit chroma422
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 12 Mar 2013 11:33:19 +0000 (12:33 +0100)]
h264: remove redundant freeing of DPB in h264_decode_end
free_tables() frees it already.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the CHROMA444 macro.
This way it does not look like a constant.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the CHROMA422 macro.
This way it does not look like a constant.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the CABAC macro.
This way it does not look like a constant.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.
This way it does not look like a constant.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the FIELD_PICTURE macro.
This way it does not look like a constant.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the FRAME_MBAFF macro.
This way it does not look like a constant.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the MB_FIELD macro.
This way it does not look like a constant.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the MB_MBAFF macro.
This way it does not look like a constant.
Anton Khirnov [Sat, 5 Nov 2011 18:26:54 +0000 (19:26 +0100)]
h264: merge common_init() into ff_h264_decode_init.
There is no point in keeping those separate.
Anton Khirnov [Sat, 9 Mar 2013 19:21:17 +0000 (20:21 +0100)]
h264: make ff_h264_frame_start static.
It is not called from outside h264.c
Paul B Mahol [Thu, 21 Mar 2013 09:17:32 +0000 (09:17 +0000)]
lavfi/vf_stereo3d: use standard options parsing
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Stephen Hutchinson [Tue, 26 Feb 2013 23:03:01 +0000 (18:03 -0500)]
Provide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/.
The versions of the headers are the same as those provided with x264
for consistency's sake.
d s [Tue, 26 Feb 2013 23:02:20 +0000 (18:02 -0500)]
AviSynth demuxer rewrite.
Dynamically loads the library itself, rather than through VfW.
Supports AvxSynth on Linux and OS X.
Supports the new colorspaces added in AviSynth 2.6 when used
with AviSynth 2.6.
Michael Niedermayer [Thu, 21 Mar 2013 03:05:02 +0000 (04:05 +0100)]
avformat/avs: increase probe score to preempt conflict with avxsynth
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 19 Mar 2013 21:47:49 +0000 (22:47 +0100)]
lavc/utils: fix metadata audio frame memleak in case of non refcounted frames.
The metadata must be set before saving the frame to avci->to_free,
otherwise it will leak.
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Michael Niedermayer [Wed, 20 Mar 2013 23:49:24 +0000 (00:49 +0100)]
asrc_sine: avoid use of INFINITY as it might be a non constant
This should fix compilation on openbsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Mar 2013 20:41:22 +0000 (21:41 +0100)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/vf_yadif: use standard options parsing.
lavfi/vf_unsharp: use standard options parsing.
lavfi/vf_transpose: use standard options parsing.
lavfi/vf_pad: use standard options parsing.
lavfi/vf_fps: use standard options parsing.
lavfi/vf_fade: use standard options parsing.
lavi/vf_drawbox: use standard options parsing.
lavfi/vf_delogo: use standard options parsing.
lavfi/vf_decimate: use standard options parsing.
lavfi/vf_crop: use standard options parsing.
lavfi/af_volume: use standard options parsing.
lavfi/vf_tile: use standard options parsing.
lavfi/avf_concat: use standard options parsing.
lavfi: add common code to handle options parsing.
lavf/vobsub: free index pseudo-packet.
ffmpeg: fix freeing of sub2video frame.
lavfi: add sine audio source.
lavu/opt: add AV_OPT_TYPE_DURATION.
lavfi/concat: fix silence duration computation.
lavf/concatdec: support seeking.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Frank Galligan [Thu, 7 Mar 2013 16:11:38 +0000 (08:11 -0800)]
matroskadec: Add support for parsing Matroska ContentEncKeyID
This patch adds the enums for the ContentEncryption elements.
This patch also adds support for parsing the ContentEncKeyID. The
ContentEncKeyID is then base64 encoded and stored in the stream's
metadata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 16 Mar 2013 20:28:02 +0000 (21:28 +0100)]
lavfi/vf_yadif: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 20:27:56 +0000 (21:27 +0100)]
lavfi/vf_unsharp: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 20:27:48 +0000 (21:27 +0100)]
lavfi/vf_transpose: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 20:27:41 +0000 (21:27 +0100)]
lavfi/vf_pad: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 20:27:34 +0000 (21:27 +0100)]
lavfi/vf_fps: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 20:27:24 +0000 (21:27 +0100)]
lavfi/vf_fade: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 20:27:10 +0000 (21:27 +0100)]
lavi/vf_drawbox: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 20:14:57 +0000 (21:14 +0100)]
lavfi/vf_delogo: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 20:08:06 +0000 (21:08 +0100)]
lavfi/vf_decimate: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 20:03:31 +0000 (21:03 +0100)]
lavfi/vf_crop: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 19:54:57 +0000 (20:54 +0100)]
lavfi/af_volume: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 19:41:36 +0000 (20:41 +0100)]
lavfi/vf_tile: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 19:41:06 +0000 (20:41 +0100)]
lavfi/avf_concat: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 19:40:30 +0000 (20:40 +0100)]
lavfi: add common code to handle options parsing.
Nicolas George [Wed, 20 Mar 2013 10:12:59 +0000 (11:12 +0100)]
lavf/vobsub: free index pseudo-packet.
Nicolas George [Wed, 20 Mar 2013 10:12:20 +0000 (11:12 +0100)]
ffmpeg: fix freeing of sub2video frame.
Nicolas George [Sat, 16 Mar 2013 15:33:05 +0000 (16:33 +0100)]
lavfi: add sine audio source.
Nicolas George [Sat, 16 Mar 2013 14:25:55 +0000 (15:25 +0100)]
lavu/opt: add AV_OPT_TYPE_DURATION.
Nicolas George [Sat, 16 Mar 2013 11:21:14 +0000 (12:21 +0100)]
lavfi/concat: fix silence duration computation.
Inside send_silence(), delta_ts was used inconsistently:
sometimes as the new value, sometimes as the old value.
Consistently use it as the new value, and add an argument
to know the last segment duration.
Nicolas George [Thu, 14 Feb 2013 15:00:06 +0000 (16:00 +0100)]
lavf/concatdec: support seeking.
Michael Niedermayer [Wed, 20 Mar 2013 16:49:20 +0000 (17:49 +0100)]
avformat: Fix infinite probing that reads the whole file
Fixes: otonajoshi_avformat_tries_to_load_whole.ts
Reported-by: JEEB (on IRC)
Thanks-to: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Mar 2013 16:23:23 +0000 (17:23 +0100)]
av_find_stream_info: change read_size to 64bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Tue, 19 Mar 2013 14:49:53 +0000 (15:49 +0100)]
fate: add tests for h264 decoder reinit
Michael Niedermayer [Wed, 20 Mar 2013 12:57:59 +0000 (13:57 +0100)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavu/frame: use channels rather than channel_layout.
lavf: avformat_seek_file(): validate stream_index.
lavf/concatdec: fix possible leak in case of malloc failure.
lavfi/buffersink: check av_frame_ref() failure.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nedeljko Babic [Wed, 20 Mar 2013 10:43:40 +0000 (11:43 +0100)]
libavcodec/mips: fix for mips optimized fp fft with hard coded tables disabled
Floating point FFT (nips optimized) breaks when hard coded tables are
not enabled because MIPS optimization of floating point FFT uses only
ff_init_ff_cos_tabs(16) which is not enabled by default in that case.
This patch is fixing it.
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Mar 2013 12:02:27 +0000 (13:02 +0100)]
avutil/atomic: use av_assert0()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Mar 2013 12:43:05 +0000 (13:43 +0100)]
avutil: fix compilation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 16 Mar 2013 10:33:25 +0000 (11:33 +0100)]
lavu/frame: use channels rather than channel_layout.
Nicolas George [Wed, 20 Mar 2013 11:27:42 +0000 (12:27 +0100)]
lavf: avformat_seek_file(): validate stream_index.
Nicolas George [Wed, 20 Mar 2013 09:18:12 +0000 (10:18 +0100)]
lavf/concatdec: fix possible leak in case of malloc failure.
Fix CID 747737.
Nicolas George [Wed, 20 Mar 2013 10:40:28 +0000 (11:40 +0100)]
lavfi/buffersink: check av_frame_ref() failure.
Paul B Mahol [Sat, 16 Mar 2013 19:00:39 +0000 (19:00 +0000)]
lavfi/showwaves: make use of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 17 Mar 2013 10:49:56 +0000 (10:49 +0000)]
lavu/opt: add AV_OPT_VIDEO_RATE option
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Janne Grunau [Wed, 20 Mar 2013 11:57:46 +0000 (12:57 +0100)]
h264: fix bit depth changes with frame threading
AVCodecContext.bits_per_raw_sample is updated from the previous thread
in the generic update function before the codec specific update_thread
function is called. The check for reinitialization of dsp functions uses
bits_per_raw_sample. When called from update_thread_context it will be
already at the current value and the dsp functions aren't updated if
only the bit depth changes.
Bojan Zivkovic [Wed, 6 Mar 2013 13:55:06 +0000 (14:55 +0100)]
mips: Optimization of IIR filter function
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Bojan Zivkovic [Wed, 6 Mar 2013 13:55:05 +0000 (14:55 +0100)]
mips: Optimization of AAC coefficients encoder functions
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Mar 2013 11:03:49 +0000 (12:03 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Pass the parameters to do_adobe_auth in the right order
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Mar 2013 10:57:22 +0000 (11:57 +0100)]
Merge commit '
c3ebfcd6e1327ca7bbcaee822e593c2da6cfd352'
* commit '
c3ebfcd6e1327ca7bbcaee822e593c2da6cfd352':
mpegvideo: allocate hwaccel privdata after the frame buffer
h264: allocate hwaccel privdata after the frame buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Mar 2013 10:50:26 +0000 (11:50 +0100)]
Merge commit '
c71c80f53b6a63fd6360d9de5a262f9e7c85681f'
* commit '
c71c80f53b6a63fd6360d9de5a262f9e7c85681f':
pthread: unref already decoded frames when flushing the decoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Mar 2013 10:43:20 +0000 (11:43 +0100)]
Merge commit '
4e70d66ded537cadd32dbd02a38c3d86a203c812'
* commit '
4e70d66ded537cadd32dbd02a38c3d86a203c812':
mpegvideo: fix allocation of the hwaccel_picture_private data
lavc: update the doxy for avcodec_decode_{video,audio} wtih refcounting.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Mar 2013 10:30:49 +0000 (11:30 +0100)]
Merge commit '
6599b087de62a5f9f2a8d61a1952d777d1bff804'
* commit '
6599b087de62a5f9f2a8d61a1952d777d1bff804':
buffersrc: fix a typo.
lavc, lavfi: fix counting number of planes in AVBufferRef wrappers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Mar 2013 10:24:11 +0000 (11:24 +0100)]
Merge commit '
2c328a907978b61949fd20f7c991803174337855'
* commit '
2c328a907978b61949fd20f7c991803174337855':
pixdesc: add a function for counting planes in a pixel format.
avplay: remove the -debug option.
Revert "asfenc: return error on negative timestamp"
Conflicts:
doc/APIchanges
doc/ffplay.texi
ffplay.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 20 Mar 2013 09:07:53 +0000 (11:07 +0200)]
rtmp: Pass the parameters to do_adobe_auth in the right order
do_adobe_auth takes the parameters in the order "opaque, challenge".
Due to the way they are treated, this didn't matter in the tested
setups though - if both are set, we only use one. In the tested
setups (Wowza and Akamai) either one of them were null or they
were both set to the same value, which is why this worked before.
Signed-off-by: Martin Storsjö <martin@martin.st>