summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '47812070a267cbdf74164e154d03d99bf8ced100'Michael Niedermayer2013-01-151-1/+2
|\ | | | | | | | | | | | | * commit '47812070a267cbdf74164e154d03d99bf8ced100': libx264: use the library specific default rc_initial_buffer_occupancy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: use the library specific default rc_initial_buffer_occupancyLuca Barbato2013-01-151-1/+2
| | | | | | | | | | | | | | | | By default libav sets it to 3/4 while x264 sets it to 9/10. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d'Michael Niedermayer2013-01-151-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d': lavc: set the default rc_initial_buffer_occupancy Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: set the default rc_initial_buffer_occupancyLuca Barbato2013-01-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | rc_buffer_size is not set before. Solve the initial the rate control underflow issue reported in bug 222. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668'Michael Niedermayer2013-01-156-13/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8c772de53d29afb1bada88afa859fce8489c668': nutdec: Always return a value from nut_read_timestamp() configure: Make warnings from -Wreturn-type fatal errors x86: ABS2: port to cpuflags vdpau: Remove av_unused attribute from function declaration h264: fix ff_generate_sliding_window_mmcos() prototype. Conflicts: configure libavformat/nutdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: ABS2: port to cpuflagsDiego Biurrun2013-01-142-5/+0
| |
| * vdpau: Remove av_unused attribute from function declarationRémi Denis-Courmont2013-01-141-2/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * h264: fix ff_generate_sliding_window_mmcos() prototype.Anton Khirnov2013-01-143-6/+12
| | | | | | | | | | | | | | It's been returning an error value since bad446e251405dc250c3cbee199072e083a1e4b9 Also check for the errors it returns.
| * libtheoraenc: fix granularity of video qualityMaximilian Seesslen2013-01-141-1/+1
| | | | | | | | | | | | | | | | The floating point version of av_clip has to be used when converting the quality level. Signed-off-by: Maximilian Seesslen <mes@seesslen.net> Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264: don't clobber mmco opcode tables for non-first slice headers.Ronald S. Bultje2013-01-143-46/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clobbering these tables will temporarily clobber the template used as a basis for other threads to start decoding from. If the other decoding thread updates from the template right at that moment, subsequent threads will get invalid (or, usually, none at all) mmco tables. This leads to invalid reference lists and subsequent decode failures. Therefore, instead, decode the mmco tables only for the first slice in a field or frame. For other slices, decode the bits and ensure they are identical to the mmco tables in the first slice, but don't ever clobber the context state. This prevents other threads from using a clobbered/invalid template as starting point for decoding, and thus fixes decoding in these cases. This fixes occasional (~1%) failures of h264-conformance-mr1_bt_a with frame-multithreading enabled. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '3f111804eb5c603a344706b84b7164cbf7b4e0df'Michael Niedermayer2013-01-156-17/+90
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f111804eb5c603a344706b84b7164cbf7b4e0df': libvpx: make vp8 and vp9 selectable libvpx: support vp9 nut: support vp9 tag mkv: support vp9 tag rtpdec: Make variables that should wrap unsigned Conflicts: configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libvpx: make vp8 and vp9 selectableLuca Barbato2013-01-144-26/+34
| | | | | | | | Support older libvpx versions.
| * libvpx: support vp9Luca Barbato2013-01-144-4/+68
| | | | | | | | This feature is experimental use at your risk
| * mkv: support vp9 tagTom Finegan2013-01-141-0/+1
| |
* | Merge commit 'ba0c72a9ae1e2954e5dcf920f7b4e9a8f8a22f3e'Michael Niedermayer2013-01-151-1/+0
|\ \ | |/ | | | | | | | | | | | | * commit 'ba0c72a9ae1e2954e5dcf920f7b4e9a8f8a22f3e': build: Remove stray Makefile entry for non-existent VCR1 encoder rtpdec: Handle more received packets than expected when sending RR Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Remove stray Makefile entry for non-existent VCR1 encoderDiego Biurrun2013-01-141-1/+0
| |
* | h264: don't clobber mmco opcode tables for non-first slice headers.Ronald S. Bultje2013-01-153-47/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clobbering these tables will temporarily clobber the template used as a basis for other threads to start decoding from. If the other decoding thread updates from the template right at that moment, subsequent threads will get invalid (or, usually, none at all) mmco tables. This leads to invalid reference lists and subsequent decode failures. Therefore, instead, decode the mmco tables only for the first slice in a field or frame. For other slices, decode the bits and ensure they are identical to the mmco tables in the first slice, but don't ever clobber the context state. This prevents other threads from using a clobbered/invalid template as starting point for decoding, and thus fixes decoding in these cases. This fixes occasional (~1%) failures of h264-conformance-mr1_bt_a with frame-multithreading enabled. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: Fix long standing race condition with frame threadsMichael Niedermayer2013-01-152-3/+10
| | | | | | | | | | | | | | | | | | | | Since resolution change support this also was exploitable, which is how it was found. Fixes read after free and out of array reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix compilation with libutvideo version 12.0.0Stephen Hutchinson2013-01-151-0/+10
| | | | | | | | Reviewed-by: Derek Buitenhuis
* | x86/Makefile: move dirac_dwt to right typeMichael Niedermayer2013-01-141-1/+2
| | | | | | | | | | | | Fix build failure without yasm Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/dirac: fix asm on win64Michael Niedermayer2013-01-142-0/+19
| | | | | | | | | | | | | | This could also be fixed by changing the argument type if someone prefers that and wants to change it ... Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: split snow and dirac DWTsMichael Niedermayer2013-01-1415-660/+744
| | | | | | | | | | | | | | There is only about 4 lines of common code, so it alot cleaner when seperated. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nuv: remove unused variableMichael Niedermayer2013-01-141-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | init_get_bits: fix off by 1 errorMichael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | init_get_bits8: zero pointers & struct on errorMichael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | init_get_bits8: check byte_size against being positiveMichael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-141-122/+150
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmpproto: Fix assignments in if() lavf: Fix assignments in if() svq1enc: Fix assignments in if() lavc: Fix assignments in if() when calling ff_af_queue_add h264: Fix assignments in if() truemotion2: cosmetics, reformat Conflicts: libavcodec/svq1enc.c libavcodec/truemotion2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * svq1enc: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavc: Fix assignments in if() when calling ff_af_queue_addMichael Niedermayer2013-01-1410-10/+10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | | | | | | | | | Fixes null pointer dereference later, since if this function failed, a positive return value was returned to the caller. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Martin Storsjö <martin@martin.st>
| * truemotion2: cosmetics, reformatAnton Khirnov2013-01-141-122/+150
| |
* | Merge commit 'df9036830b15997a3e9c3f2c632ed98d64f9deef'Michael Niedermayer2013-01-143-85/+75
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'df9036830b15997a3e9c3f2c632ed98d64f9deef': truemotion2: return meaningful error codes. tscc: remove some pointless comments and empty lines. tscc: return meaningful error codes. loco: cosmetics, reformat Conflicts: libavcodec/truemotion2.c libavcodec/tscc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * truemotion2: return meaningful error codes.Anton Khirnov2013-01-141-35/+32
| |
| * tscc: remove some pointless comments and empty lines.Anton Khirnov2013-01-141-23/+0
| |
| * tscc: return meaningful error codes.Anton Khirnov2013-01-141-8/+8
| |
| * loco: cosmetics, reformatAnton Khirnov2013-01-141-31/+47
| |
* | Merge commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e'Michael Niedermayer2013-01-143-45/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e': loco: return meaningful error codes. flicvideo: return meaningful error codes. vcr1: remove disabled encoder stub Conflicts: libavcodec/flicvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * loco: return meaningful error codes.Anton Khirnov2013-01-141-5/+5
| |
| * flicvideo: return meaningful error codes.Anton Khirnov2013-01-141-11/+11
| |
| * vcr1: remove disabled encoder stubAnton Khirnov2013-01-141-39/+0
| |
* | Merge commit '74a9a624c5c4d50760d8d57458eba57366f6cb26'Michael Niedermayer2013-01-143-24/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '74a9a624c5c4d50760d8d57458eba57366f6cb26': vcr1: return a meaningful error code. rpza: return a meaningful error code. qdrw: cosmetics, reformat Conflicts: libavcodec/qdrw.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vcr1: return a meaningful error code.Anton Khirnov2013-01-141-3/+3
| |
| * rpza: return a meaningful error code.Anton Khirnov2013-01-141-2/+3
| |
| * qdrw: cosmetics, reformatAnton Khirnov2013-01-141-21/+21
| |
* | Merge commit '688b132b881d423877e38dc82f17e23a604be676'Michael Niedermayer2013-01-148-48/+51
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '688b132b881d423877e38dc82f17e23a604be676': qdrw: return meaningful error codes. qtrle: return a meaningful error code. gifdec: return meaningful error codes. interplayvideo: remove a static variable. interplayvideo: return meaningful error codes. lcldec: return meaningful error codes. targa: return meaningful error codes. qpeg: return a meaningful error code. nuv: return meaningful error codes. Conflicts: libavcodec/gifdec.c libavcodec/interplayvideo.c libavcodec/nuv.c libavcodec/qpeg.c libavcodec/targa.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qdrw: return meaningful error codes.Anton Khirnov2013-01-141-4/+4
| |
| * qtrle: return a meaningful error code.Anton Khirnov2013-01-141-2/+3
| |
| * gifdec: return meaningful error codes.Anton Khirnov2013-01-141-14/+15
| |
| * interplayvideo: remove a static variable.Anton Khirnov2013-01-141-5/+1
| |
| * interplayvideo: return meaningful error codes.Anton Khirnov2013-01-141-4/+5
| |
View Lorry Controller Status