summaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* 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-145-20/+47
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| |
| * 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-141-3/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'Michael Niedermayer2013-01-145-1/+330
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * vdpau: Add VC-1 decoding via hwaccel infrastructureRémi Denis-Courmont2013-01-134-1/+132
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vdpau: Add H.264 decoding via hwaccel infrastructureRémi Denis-Courmont2013-01-134-1/+199
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b'Michael Niedermayer2013-01-147-37/+234
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b': vdpau: Add MPEG-4 decoding via hwaccel infrastructure vdpau: Add MPEG-1/2 decoding via hwaccel infrastructure Conflicts: configure libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: Add MPEG-4 decoding via hwaccel infrastructureRémi Denis-Courmont2013-01-134-1/+115
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vdpau: Add MPEG-1/2 decoding via hwaccel infrastructureRémi Denis-Courmont2013-01-135-1/+122
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'Michael Niedermayer2013-01-144-7/+127
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '44e065d56c87d6a9d0effccec5f31517f72924ec': vdpau: Add context and common helpers for hwaccel support Conflicts: Changelog doc/APIchanges libavcodec/vdpau.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: Add context and common helpers for hwaccel supportRémi Denis-Courmont2013-01-134-7/+127
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | tiff: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | svq1enc: Fix assignments in if()Michael Niedermayer2013-01-141-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ra144enc: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nellymoserenc: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvorbisenc: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvo-aacenc: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libspeexenc: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libopencore-amr: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libmp3lame: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libfdk-aacenc: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libfaac: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacenc: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: don t leave stale pointers in delayed_pic in flush_changes.Michael Niedermayer2013-01-141-1/+8
| | | | | | | | | | | | | | Fixes null pointer dereference & assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: fix () placementMichael Niedermayer2013-01-141-1/+1
| | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pthread: Do not use a half updated context as master for deallocation.Michael Niedermayer2013-01-131-1/+5
| | | | | | | | | | | | | | Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dvdsubenc: use unsigned shifts to avoid shifting into the sign bitMichael Niedermayer2013-01-121-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dvdsubdec: use unsigned shifts to avoid shifting into the sign bitMichael Niedermayer2013-01-121-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: ff_find_pix_fmt ->avprivMichael Niedermayer2013-01-122-5/+15
| | | | | | | | | | Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6'Michael Niedermayer2013-01-121-490/+597
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6': ratecontrol: K&R cosmetic formatting rtpdec: Remove a useless todo comment Conflicts: libavcodec/ratecontrol.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud