summaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d'Michael Niedermayer2014-01-061-1/+1
|\ | | | | | | | | | | | | | | | | | | | | * commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d': lavc: do not leak the internal frame if opening the codec fails Conflicts: libavcodec/utils.c See: 8b285f03f70e884312c6c4e00a1377cfd85a3a7a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: do not leak the internal frame if opening the codec failsAnton Khirnov2014-01-061-1/+3
| |
* | Merge commit '8058284ce09030b47512746d726fb2ad3ae8a20f'Michael Niedermayer2014-01-061-12/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '8058284ce09030b47512746d726fb2ad3ae8a20f': lavc: add 422/444 YUV with alpha to align_dimensions() Conflicts: libavcodec/utils.c Only cosmetical changes happen as these formats already where in the list before Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add 422/444 YUV with alpha to align_dimensions()Anton Khirnov2014-01-061-0/+4
| | | | | | | | Aligns frame dimensions to 16, which fixes potential invalid writes.
* | Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'Michael Niedermayer2014-01-051-0/+20
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '5b4797a21db900b7d509660b7a4d49829089b004': avframe: add AV_FRAME_DATA_MATRIXENCODING side data type. Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.Tim Walker2014-01-051-0/+20
| | | | | | | | Includes a libavcodec utility function to update a frame's side data.
* | lavc/utils: check av_frame_alloc() failure.Nicolas George2013-12-301-0/+4
| |
* | avcodec/utils: fix memleak on avcodec_open2() failureMichael Niedermayer2013-12-231-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: support raising major version in sonameMichael Niedermayer2013-12-221-2/+8
| | | | | | | | | | | | | | this allows seperate installation of shared libs that should not conflict with whatever is already installed. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: drop 2 dependancies on sizeof(AVFrame)Michael Niedermayer2013-12-171-10/+16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: implement avcodec_alloc_frame() through av_alloc_frame()Michael Niedermayer2013-12-171-9/+1
| | | | | | | | | | | | | | This ensures that theres just one AVFrame allocation function and libs dont produce multiple AVFrame variants after a minor lib update Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: use av_frame_unref() to set frame defaultsMichael Niedermayer2013-12-171-13/+1
| | | | | | | | | | | | This ensures that the code isnt duplicated and cant become out of sync Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: av_register_codec & hwaccel() that work in O(1) timeMichael Niedermayer2013-12-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | Its possible to implement this with a few lines less code but it then would flip the order of the list and require registration of external codecs to be done first, also it could break user applications due to this. Thus to maintain ABI this slighty more complex solution is used. Reviewed-by: Stefano Sabatini Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671'Michael Niedermayer2013-12-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671': lavc: deprecate avcodec_get_frame_defaults(). Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate avcodec_get_frame_defaults().Anton Khirnov2013-12-111-1/+1
| | | | | | | | | | Also bump libavcodec micro and add an APIchanges entry saying that av_frame_* should now be used instead of the lavc AVFrame functions.
* | Merge commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521'Michael Niedermayer2013-12-111-2/+2
|\ \ | |/ | | | | | | | | | | * commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521': lavc: call av_frame_unref() instead of avcodec_get_frame_defaults(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: call av_frame_unref() instead of avcodec_get_frame_defaults().Anton Khirnov2013-12-111-2/+2
| | | | | | | | avcodec_get_frame_defaults() will be deprecated.
* | Merge commit '943135621830ac3857d3cf766cfc280a95bb3c13'Michael Niedermayer2013-12-111-12/+2
|\ \ | |/ | | | | | | | | | | * commit '943135621830ac3857d3cf766cfc280a95bb3c13': lavc: deprecate avcodec_free_frame() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate avcodec_free_frame()Anton Khirnov2013-12-111-12/+2
| | | | | | | | av_frame_free() should be used instead.
* | avcodec/utils: Print warning if avcodec_set_dimensions() failedMichael Niedermayer2013-12-111-1/+4
| | | | | | | | | | Fixes CID1135744 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: check that extended data has been set correctly instead of ↵Michael Niedermayer2013-12-101-1/+1
| | | | | | | | | | | | forcing it in avcodec_decode_video2() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: dont depend on the channel layout in unrefcount_frame()Michael Niedermayer2013-12-101-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '37a749012aaacc801fe860428417a6d7b81c103f'Michael Niedermayer2013-12-091-17/+60
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '37a749012aaacc801fe860428417a6d7b81c103f': lavc: rework handling of refcounted_frames=0 Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: rework handling of refcounted_frames=0Anton Khirnov2013-12-091-17/+59
| | | | | | | | | | | | | | | | | | Use only proper AVFrame API (no assigning of whole frames, since that hardcodes sizeof(AVFrame) into lavc). Make a copy of the side data, so the caller can use av_frame_unref/free on non-refcounted frames, eliminating the need for avcodec_get_frame_defaults()/avcodec_free_frame().
* | Merge commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8'Michael Niedermayer2013-12-091-4/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8': lavc/decode_video(): always unref the frame if there is no output in decode_video Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc/decode_video(): always unref the frame if there is no output in ↵Anton Khirnov2013-12-091-4/+2
| | | | | | | | | | | | | | | | decode_video Not just on failure. This is the same thing that is done in the audio path and should prevent leaks in decoders that allocate a frame, but then end up not writing into it.
* | Merge commit '85f947aefb3dae81f65f518acdffa8e31c679654'Michael Niedermayer2013-12-091-1/+1
|\ \ | |/ | | | | | | | | | | * commit '85f947aefb3dae81f65f518acdffa8e31c679654': lavc: remove a pointless check in decode_audio4() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove a pointless check in decode_audio4()Anton Khirnov2013-12-091-1/+1
| | | | | | | | av_frame_unref() works fine on unallocated frames.
* | Merge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'Michael Niedermayer2013-12-091-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56': lavc: use buf[0] instead of data[0] as the indicator of an allocated frame Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use buf[0] instead of data[0] as the indicator of an allocated frameAnton Khirnov2013-12-091-1/+1
| | | | | | | | data[0] may be NULL for valid frames with hwaccel pixel formats.
* | Merge commit 'e5419709f50593769037ab77d7102f82d9260784'Michael Niedermayer2013-12-091-13/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'e5419709f50593769037ab77d7102f82d9260784': lavc: remove the extended_data workarounds. Conflicts: libavcodec/utils.c One hunk is not merged as not all codecs are updated yet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove the extended_data workarounds.Anton Khirnov2013-12-091-12/+0
| | | | | | | | All decoders should now handle it properly.
* | do O(1) instead of O(n) atomic operations in register functionsMichael Niedermayer2013-12-061-2/+3
| | | | | | | | | | | | about 1ms faster startup time Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: remove unused variableMichael Niedermayer2013-11-211-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: move end zeroing code from av_packet_split_side_data() to ↵Michael Niedermayer2013-11-211-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | avcodec_decode_subtitle2() This code changes the input packet, which is read only and can in rare circumstances lead to decoder errors. (i run into one of these in the audio decoder, which corrupted the packet during av_find_stream_info() so that actual decoding that single packet failed later) Until a better fix is implemented, this commit limits the problem. A better fix might be to make the subtitle decoders not depend on data[size] = 0 or to copy their input when this is not the case.
* | avcodec/utils: use the unpack_dictionary functionBen Boeckel2013-11-201-21/+4
| | | | | | | | | | Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d'Michael Niedermayer2013-11-171-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d': lavc: deprecate avcodec_alloc_frame(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate avcodec_alloc_frame().Anton Khirnov2013-11-161-0/+2
| |
* | Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'Michael Niedermayer2013-11-161-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b9c3b4505206143d85398c1410949319fa1180f': Replace all instances of avcodec_alloc_frame() with av_frame_alloc(). Conflicts: doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c libavcodec/alacenc.c libavcodec/libopenjpegenc.c libavcodec/libvpxenc.c libavcodec/pcm.c libavcodec/xbmenc.c libavcodec/xwdenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all instances of avcodec_alloc_frame() with av_frame_alloc().Anton Khirnov2013-11-161-1/+1
| |
* | Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'Michael Niedermayer2013-11-141-20/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4': Move av_fast_{m,re}alloc from lavc to lavu. Conflicts: libavcodec/avcodec.h libavcodec/utils.c libavutil/mem.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move av_fast_{m,re}alloc from lavc to lavu.Anton Khirnov2013-11-141-26/+6
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-101-1/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: hwaccel: Simplify ff_find_hwaccel Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: Simplify ff_find_hwaccelLuca Barbato2013-11-101-1/+4
| | | | | | | | It is always called by passing fields from an AVCodecContext.
* | Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'Michael Niedermayer2013-11-041-13/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9': lavc: move AVCodecContext.pkt to AVCodecInternal Conflicts: libavcodec/internal.h libavcodec/rawdec.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: move AVCodecContext.pkt to AVCodecInternalAnton Khirnov2013-11-041-4/+4
| | | | | | | | It's a private field, not meant to be accessed from outside lavc.
* | Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'Michael Niedermayer2013-11-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12': pthread: store thread contexts in AVCodecInternal instead of AVCodecContext Conflicts: libavcodec/internal.h libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread: store thread contexts in AVCodecInternal instead of AVCodecContextAnton Khirnov2013-11-041-1/+1
| | | | | | | | | | | | It's a private field, it should not be visible to callers. Deprecate AVCodecContext.thread_opaque
* | lavc: remove dead FF_API_AVCODEC_OPEN APIStefano Sabatini2013-11-031-7/+0
| |
* | Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942'Michael Niedermayer2013-11-011-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '064698d381e1e7790f21b0199a8930ea04e2e942': Add HEVC decoder Conflicts: Changelog libavcodec/Makefile libavcodec/allcodecs.c libavcodec/hevc.c libavcodec/hevc.h libavcodec/hevc_cabac.c libavcodec/hevc_filter.c libavcodec/hevc_mvs.c libavcodec/hevc_parser.c libavcodec/hevc_ps.c libavcodec/hevc_refs.c libavcodec/hevc_sei.c libavcodec/hevcdsp.c libavcodec/hevcdsp_template.c libavcodec/hevcpred.c libavcodec/hevcpred_template.c libavcodec/version.h cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg. Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud