summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* The c99-to-c89 binaries are now hosted on videolan.org.Carl Eugen Hoyos2013-01-141-1/+1
|
* 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>
| * rtmpproto: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * 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
| |
| * lcldec: return meaningful error codes.Anton Khirnov2013-01-141-14/+13
| |
| * targa: return meaningful error codes.Anton Khirnov2013-01-141-8/+8
| |
| * qpeg: return a meaningful error code.Anton Khirnov2013-01-141-3/+3
| |
| * nuv: return meaningful error codes.Anton Khirnov2013-01-141-13/+17
| |
* | Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de'Michael Niedermayer2013-01-146-42/+81
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de': pcx: return meaningful error codes. tmv: return meaningful error codes. msrle: return meaningful error codes. cscd: return meaningful error codes. yadif: x86: fix build for compilers without aligned stack lavc: introduce the convenience function init_get_bits8 lavc: check for overflow in init_get_bits Conflicts: libavcodec/cscd.c libavcodec/pcx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pcx: return meaningful error codes.Anton Khirnov2013-01-141-8/+8
| |
| * tmv: return meaningful error codes.Anton Khirnov2013-01-141-3/+4
| |
| * msrle: return meaningful error codes.Anton Khirnov2013-01-141-3/+4
| |
| * cscd: return meaningful error codes.Anton Khirnov2013-01-141-5/+6
| |
| * yadif: x86: fix build for compilers without aligned stackDaniel Kang2013-01-141-22/+34
| | | | | | | | | | | | | | Manually load registers to avoid using 8 registers on x86_32 with compilers that do not align the stack (e.g. MSVC). Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * lavc: introduce the convenience function init_get_bits8Luca Barbato2013-01-141-0/+16
| | | | | | | | | | Accept the buffer size in bytes and check for overflow before passing the value in bits to init_get_bits.
| * lavc: check for overflow in init_get_bitsLuca Barbato2013-01-141-7/+15
| | | | | | | | | | | | | | Fix an undefined behaviour and make the function return a proper error in case of overflow. CC: libav-stable@libav.org
* | Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1'Michael Niedermayer2013-01-142-9/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1': avpacket: free side data in av_free_packet(). v4l2: do not assert on a value received from outside of Libav v4l2: set the average framerate instead of codec timebase. Conflicts: libavcodec/avpacket.c libavdevice/v4l2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: free side data in av_free_packet().Anton Khirnov2013-01-131-8/+6
| | | | | | | | | | | | | | | | | | Freeing it in av_destruct_packet(), as is done currently, would mean that we allow it to be allocated with other means. But that would make av_packet_new_side_data() unsafe. Side data is not expected to be large, so copying it if required shouldn't be a problem.
| * v4l2: do not assert on a value received from outside of LibavAnton Khirnov2013-01-131-1/+6
| |
| * v4l2: set the average framerate instead of codec timebase.Anton Khirnov2013-01-131-4/+4
| | | | | | | | Codec timebase is supposed to be set by decoders only.
* | Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'Michael Niedermayer2013-01-147-22/+345
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '246da0b13551b1f80f067e4f258e5bd691f5ab33': v4l2: avoid pointless indirection. vdpau: Add VC-1 decoding via hwaccel infrastructure vdpau: Add H.264 decoding via hwaccel infrastructure Conflicts: configure libavcodec/Makefile libavcodec/version.h libavdevice/v4l2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status