summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lavu/eval: add between() function.Clément Bœsch2013-03-224-2/+28
|
* Do not fail in get_buffer_internal() if pix_fmt planes == 0.Carl Eugen Hoyos2013-03-221-0/+2
| | | | Fixes VDPAU decoding, reported by Ilja Sekler
* error_resilience: fix const correctness, silence warningsMichael Niedermayer2013-03-211-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vdpau.h: change vdpau_render_state layout to match fork if ↵Michael Niedermayer2013-03-211-0/+8
| | | | | | | | AV_HAVE_INCOMPATIBLE_FORK_ABI This might fix a compatibility issue. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vda_h264: fix for VDA compileAndrew Euell2013-03-211-1/+1
| | | | | | the VDA code needs to be updated to use the CHROMA(h) macros Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* sonicdec: update to new buffer APIMichael Niedermayer2013-03-211-8/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* sonicenc: fix mono decorrelationMichael Niedermayer2013-03-211-0/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* sonicdec: fix frame sizeMichael Niedermayer2013-03-211-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* sonicdec: check decorrelationMichael Niedermayer2013-03-211-0/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* g729dec: switch to buffer refs styleMichael Niedermayer2013-03-211-8/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* v308dec: remove unneeded self assignmentMichael Niedermayer2013-03-211-1/+0
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with ↵Michael Niedermayer2013-03-213-58/+19
| | | | | | yadif injection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264: remove unused variableMichael Niedermayer2013-03-211-1/+0
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264: add an argument to CHROMA for consistencyMichael Niedermayer2013-03-212-3/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-211-7/+0
|\ | | | | | | | | | | | | * qatar/master: h264: remove redundant freeing of DPB in h264_decode_end Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: remove redundant freeing of DPB in h264_decode_endAnton Khirnov2013-03-211-7/+0
| | | | | | | | free_tables() frees it already.
* | Merge commit '23e85be58fc64b2e804e68b0034a08a6d257e523'Michael Niedermayer2013-03-217-34/+34
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * h264: add a parameter to the CHROMA444 macro.Anton Khirnov2013-03-216-18/+18
| | | | | | | | This way it does not look like a constant.
| * h264: add a parameter to the CHROMA422 macro.Anton Khirnov2013-03-217-12/+12
| | | | | | | | This way it does not look like a constant.
* | Merge commit '6d2b6f21eb45ffbda1103c772060303648714832'Michael Niedermayer2013-03-218-21/+21
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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>
| * h264: add a parameter to the CABAC macro.Anton Khirnov2013-03-216-12/+12
| | | | | | | | This way it does not look like a constant.
| * h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.Anton Khirnov2013-03-214-9/+9
| | | | | | | | This way it does not look like a constant.
* | Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'Michael Niedermayer2013-03-219-69/+69
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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>
| * h264: add a parameter to the FIELD_PICTURE macro.Anton Khirnov2013-03-215-25/+25
| | | | | | | | This way it does not look like a constant.
| * h264: add a parameter to the FRAME_MBAFF macro.Anton Khirnov2013-03-218-44/+44
| | | | | | | | This way it does not look like a constant.
* | Merge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7'Michael Niedermayer2013-03-217-44/+44
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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>
| * h264: add a parameter to the MB_FIELD macro.Anton Khirnov2013-03-217-30/+30
| | | | | | | | This way it does not look like a constant.
| * h264: add a parameter to the MB_MBAFF macro.Anton Khirnov2013-03-214-18/+18
| | | | | | | | This way it does not look like a constant.
* | Merge commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67'Michael Niedermayer2013-03-211-31/+26
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67': h264: merge common_init() into ff_h264_decode_init. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: merge common_init() into ff_h264_decode_init.Anton Khirnov2013-03-211-25/+20
| | | | | | | | There is no point in keeping those separate.
* | Merge commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e'Michael Niedermayer2013-03-212-4/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e': h264: make ff_h264_frame_start static. Conflicts: libavcodec/h264.c libavcodec/h264.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: make ff_h264_frame_start static.Anton Khirnov2013-03-212-5/+4
| | | | | | | | It is not called from outside h264.c
* | Merge commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5'Michael Niedermayer2013-03-216-0/+417
|\ \ | |/ | | | | | | | | | | | | * commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5': fate: add tests for h264 decoder reinit h264: fix bit depth changes with frame threading Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: add tests for h264 decoder reinitJanne Grunau2013-03-205-0/+412
| |
| * h264: fix bit depth changes with frame threadingJanne Grunau2013-03-201-0/+5
| | | | | | | | | | | | | | | | | | 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.
* | h264: drop special case for 9bit chroma422Michael Niedermayer2013-03-211-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/vf_stereo3d: use standard options parsingPaul B Mahol2013-03-211-24/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Provide local copies of AviSynth's and AvxSynth's requisite headers in ↵Stephen Hutchinson2013-03-214-0/+1768
| | | | | | | | | | | | | | compat/avisynth/. The versions of the headers are the same as those provided with x264 for consistency's sake.
* | AviSynth demuxer rewrite.d s2013-03-212-181/+587
| | | | | | | | | | | | | | | | 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.
* | avformat/avs: increase probe score to preempt conflict with avxsynthMichael Niedermayer2013-03-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/utils: fix metadata audio frame memleak in case of non refcounted frames.Clément Bœsch2013-03-211-1/+1
| | | | | | | | | | | | | | | | 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>
* | asrc_sine: avoid use of INFINITY as it might be a non constantMichael Niedermayer2013-03-211-4/+6
| | | | | | | | | | | | This should fix compilation on openbsd Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-03-2029-160/+506
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | lavfi/vf_yadif: use standard options parsing.Nicolas George2013-03-201-9/+3
| | |
| * | lavfi/vf_unsharp: use standard options parsing.Nicolas George2013-03-201-13/+7
| | |
| * | lavfi/vf_transpose: use standard options parsing.Nicolas George2013-03-201-12/+3
| | |
| * | lavfi/vf_pad: use standard options parsing.Nicolas George2013-03-201-15/+3
| | |
| * | lavfi/vf_fps: use standard options parsing.Nicolas George2013-03-201-8/+3
| | |
| * | lavfi/vf_fade: use standard options parsing.Nicolas George2013-03-201-16/+3
| | |
| * | lavi/vf_drawbox: use standard options parsing.Nicolas George2013-03-201-15/+3
| | |
OpenPOWER on IntegriCloud