summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de'Michael Niedermayer2013-01-14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-14
| |
| * tmv: return meaningful error codes.Anton Khirnov2013-01-14
| |
| * msrle: return meaningful error codes.Anton Khirnov2013-01-14
| |
| * cscd: return meaningful error codes.Anton Khirnov2013-01-14
| |
| * yadif: x86: fix build for compilers without aligned stackDaniel Kang2013-01-14
| | | | | | | | | | | | | | 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-14
| | | | | | | | | | 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-14
| | | | | | | | | | | | | | 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-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-13
| | | | | | | | | | | | | | | | | | 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-13
| |
| * v4l2: set the average framerate instead of codec timebase.Anton Khirnov2013-01-13
| | | | | | | | Codec timebase is supposed to be set by decoders only.
* | Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'Michael Niedermayer2013-01-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * v4l2: avoid pointless indirection.Anton Khirnov2013-01-13
| | | | | | | | | | v4l2_read_header() does no cleanup, so it can return directly, without any need for goto.
| * vdpau: Add VC-1 decoding via hwaccel infrastructureRémi Denis-Courmont2013-01-13
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vdpau: Add H.264 decoding via hwaccel infrastructureRémi Denis-Courmont2013-01-13
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b'Michael Niedermayer2013-01-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-13
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vdpau: Add MPEG-1/2 decoding via hwaccel infrastructureRémi Denis-Courmont2013-01-13
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'Michael Niedermayer2013-01-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-13
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | rtmpproto: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mux: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vsrc_testsrc: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tiff: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | svq1enc: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ra144enc: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nellymoserenc: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvorbisenc: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvo-aacenc: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libspeexenc: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libopencore-amr: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libmp3lame: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libfdk-aacenc: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libfaac: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacenc: Fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/examples: fix assignments in if()Michael Niedermayer2013-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: don t leave stale pointers in delayed_pic in flush_changes.Michael Niedermayer2013-01-14
| | | | | | | | | | | | | | Fixes null pointer dereference & assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr/dither: fix division by 0Michael Niedermayer2013-01-14
| | | | | | | | | | Found-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: fix () placementMichael Niedermayer2013-01-14
| | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: fix sws_flagsMichael Niedermayer2013-01-13
| | | | | | | | | | | | | | Fixes Ticket45 Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: fix handling of timestamps that cause multiple drops or silence injectionsMichael Niedermayer2013-01-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: limit buffer size for silence injectionMichael Niedermayer2013-01-13
| | | | | | | | | | | | This reduces memory usage for unreasonable large silence injections Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: limit buffer size for discarding.Michael Niedermayer2013-01-13
| | | | | | | | | | | | | | This prevents insane memory usage in case of insane input values. Untested due to lack of a testcase that causes such insane allocation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: extend documentation for the -vf optionStefano Sabatini2013-01-13
| | | | | | | | In particular, make it consistent with the ffmpeg docs.
* | swr: move silence buffer to context to avoid per use malloc/freeMichael Niedermayer2013-01-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: move buffer used to discard sample to contextMichael Niedermayer2013-01-13
| | | | | | | | | | | | | | | | This avoids the need to allocate & free to repeatly Fixes Ticket2122 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: clarify/extend documentation for AVFormatContext::analyzedurationStefano Sabatini2013-01-13
| | | | | | | | | | | | "analyzeduration" is not used to detect the input duration, but to specify the max probe data duration. Fix option description and related doc entry accordingly.
* | lavf/utils: clarify/extend messages in avformat_find_stream_info()Stefano Sabatini2013-01-13
| | | | | | | | | | In particular, specify the unit of the shown values in case the max probe size/duration is reached.
* | doc/ffmpeg: extend documentation for the -filter options and -af/vf aliasesStefano Sabatini2013-01-13
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 03:06:41 +0000