aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | avcodec/utils: Align YUV411 by as much as the other YUV variantsMichael Niedermayer2015-03-071-1/+1
| | | | | | | | | | | | | | | | | | Fixes out of array accesses Fixes: ffmpeg_mjpeg_crash2.avi Found-by: Thomas Lindroth <thomas.lindroth@gmail.com> Tested-by: Thomas Lindroth <thomas.lindroth@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: use correct printf specifier in ff_set_sarAndreas Cadhalpun2015-02-281-1/+1
| | | | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Assert that dst->progress is clear before ff_thread_ref_frame()Michael Niedermayer2015-02-081-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a536a4e4bc52d05f59869761337452fb1f1977f6'Michael Niedermayer2015-01-271-0/+7
|\| | | | | | | | | | | | | * commit 'a536a4e4bc52d05f59869761337452fb1f1977f6': lavc: support extracting audio service type from side data Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: support extracting audio service type from side dataAnton Khirnov2015-01-271-0/+7
| |
* | Merge commit '728685f37ab333ca35980bd01766c78d197f784a'Michael Niedermayer2015-01-271-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '728685f37ab333ca35980bd01766c78d197f784a': Add a side data type for audio service type. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavutil/frame.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add a side data type for audio service type.Anton Khirnov2015-01-271-0/+1
| | | | | | | | | | Currently, audio service type is a field in AVCodecContext. However, side data is more appropriate for this kind of information.
* | Merge commit '9a4aaae3b29392b6d74997e06be249d7d54a7394'Michael Niedermayer2015-01-151-1/+1
|\| | | | | | | | | | | | | | | * commit '9a4aaae3b29392b6d74997e06be249d7d54a7394': lavc: add GBRAP to avcodec_align_dimensions2 See: 5c057433ccd32f37ddc828d3f82c5b1ad7d3e3db Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add GBRAP to avcodec_align_dimensions2Paul B Mahol2015-01-141-0/+1
| |
* | Merge commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1'Michael Niedermayer2014-12-271-4/+11
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '57b6704ecd0f56d6a3092e448687cfd837bb0ac1': avcodec: add AVCodecContext.sw_pix_fmt Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: add AVCodecContext.sw_pix_fmtRémi Denis-Courmont2014-12-251-4/+11
| | | | | | | | | | | | | | | | This carries the pixel format that would be used if it were not for hardware acceleration. This is equal to AVCodecContext.pix_fmt if hardware acceleration is not in use. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Add FFMPEG_VERSION into the binary libsMichael Niedermayer2014-12-191-0/+3
| | | | | | | | | | | | This simplifies identifying from which revision a binary of a lib came from Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: check the private context classMichael Niedermayer2014-12-171-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Check AVFrame width/height in avcodec_encode_video2()Michael Niedermayer2014-12-071-0/+2
| | | | | | | | | | | | This is similar to the format check Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: check AVframe.format being set in avcodec_encode_video2()Michael Niedermayer2014-12-071-0/+3
| | | | | | | | | | | | | | | | | | We dont fail hard if its not set as the old API allowed this and our examples did in the distant past not set it, these examples still work with the current code and some encoders. Based on suggestion by: funman Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/utils: free private options on avcodec_open2 failLukasz Marek2014-11-251-0/+2
| | | | | | | | | | | | It protects leaking string/binary/dict options from priv context. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | avcodec/utils: Check that the data is complete in avpriv_bprint_to_extradata()Michael Niedermayer2014-11-251-0/+5
| | | | | | | | | | | | | | Fixes out of array read Fixes: asan_heap-oob_4d2250_814_cov_2745172097_JACOsub_capability_tester.jss Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Add ATRAC3+ to av_get_audio_frame_duration()Michael Niedermayer2014-11-131-0/+1
| | | | | | | | | | | | Fixes Ticket3979 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Fix warning: comparison between enum foo and enum bar ↵Michael Niedermayer2014-11-101-2/+2
| | | | | | | | | | | | [-Wenum-compare] Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: make sidedata remapping table static constMichael Niedermayer2014-11-101-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e3e317e0c015b164b6c2eb8913e393216d78de23'Michael Niedermayer2014-11-101-31/+21
|\| | | | | | | | | | | | | | | | | | | * commit 'e3e317e0c015b164b6c2eb8913e393216d78de23': lavc: Compact the side-data passthrough Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Compact the side-data passthroughLuca Barbato2014-11-091-29/+21
| |
* | Merge commit '4ff670d99bebd97429322719089363d83143477d'Michael Niedermayer2014-11-051-5/+5
|\| | | | | | | | | | | | | * commit '4ff670d99bebd97429322719089363d83143477d': hwaccel: Deinitialize hardware acceleration early enough Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: Deinitialize hardware acceleration early enoughRémi Denis-Courmont2014-11-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | The application will destroy the underlying hardware handles when get_format() gets called again. Also this ensures the deinitialization takes place if the get_format callback returns an error. Regression from 1c80c9d7ef809180042257200c7b5f6b81d0b0e2. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | lavc/utils: Make pix_fmt desc pointer const.Carl Eugen Hoyos2014-10-301-1/+1
| | | | | | | | Fixes an "initialization discards qualifiers from pointer target type" warning.
* | avcodec/utils: Align dimensions by at least their chroma sub-sampling factors.Michael Niedermayer2014-10-291-2/+6
| | | | | | | | | | | | | | Fixes: out of array accesses Fixes: asan_heap-oob_112c6b3_13_012.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: Read errno before av_log() as the callback from av_log() might ↵Michael Niedermayer2014-10-251-2/+2
| | | | | | | | | | | | affect errno Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Print the codec name that is missing on the whitelistMichael Niedermayer2014-10-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: add codec_whitelistMichael Niedermayer2014-10-191-0/+6
| | | | | | | | | | | | This allows restricting decoders to a list of needed ones for improved security Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Display pixel format information as none ... if unknown ↵Michael Niedermayer2014-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of omitting it This is similar to 20a5956b8daeee4cb59d6fa00ec809b02c04d7f8 The difference this change makes affects only rather few files but looks like: Stream #0:1: Video: mjpeg, 90k tbr, 90k tbn, 90k tbc vs. Stream #0:1: Video: mjpeg, none(bt470bg/unknown/unknown), 90k tbr, 90k tbn, 90k tbc Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4'Michael Niedermayer2014-10-171-0/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4': dump: display codec tags when available Conflicts: libavcodec/utils.c See: d2d7b7134fc387837d51aa1d7f3dbe090d35e8b4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: display codec tags when availableVittorio Giovara2014-10-171-0/+13
| | | | | | | | For both audio and video.
* | avcodec/utils: fix time_base after the framerate additionMichael Niedermayer2014-10-151-2/+2
| | | | | | | | | | | | time_base != 1/framerate for example for interlaced video Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41'Michael Niedermayer2014-10-151-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41': lavc: deprecate the use of AVCodecContext.time_base for decoding Conflicts: libavcodec/avcodec.h libavcodec/h264.c libavcodec/mpegvideo_parser.c libavcodec/utils.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate the use of AVCodecContext.time_base for decodingAnton Khirnov2014-10-151-0/+10
| | | | | | | | | | | | | | | | | | | | | | When decoding, this field holds the inverse of the framerate that can be written in the headers for some codecs. Using a field called 'time_base' for this is very misleading, as there are no timestamps associated with it. Furthermore, this field is used for a very different purpose during encoding. Add a new field, called 'framerate', to replace the use of time_base for decoding.
* | Merge commit '2df0c32ea12ddfa72ba88309812bfb13b674130f'Michael Niedermayer2014-10-141-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2df0c32ea12ddfa72ba88309812bfb13b674130f': lavc: use a separate field for exporting audio encoder padding Conflicts: libavcodec/audio_frame_queue.c libavcodec/avcodec.h libavcodec/libvorbisenc.c libavcodec/utils.c libavcodec/version.h libavcodec/wmaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use a separate field for exporting audio encoder paddingAnton Khirnov2014-10-131-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the amount of padding inserted at the beginning by some audio encoders, is exported through AVCodecContext.delay. However - the term 'delay' is heavily overloaded and can have multiple different meanings even in the case of audio encoding. - this field has entirely different meanings, depending on whether the codec context is used for encoding or decoding (and has yet another different meaning for video), preventing generic handling of the codec context. Therefore, add a new field -- AVCodecContext.initial_padding. It could conceivably be used for decoding as well at a later point.
* | avcodec/utils: Fix "warning: pointer type mismatch in conditional expression"Michael Niedermayer2014-10-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Add missing AV_PIX_FMT_YUVJ411P to color_range override code.Michael Niedermayer2014-10-091-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9f3a70c44224ed92d91df65bb9470a2649e7d019'Michael Niedermayer2014-10-091-0/+6
|\| | | | | | | | | | | | | * commit '9f3a70c44224ed92d91df65bb9470a2649e7d019': dump: print the original coded dimensions when available Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: print the original coded dimensions when availableVittorio Giovara2014-10-081-0/+6
| |
* | Merge commit '41e86146e7240f9d42e8cdb86a94bb3eb2bbe15f'Michael Niedermayer2014-10-091-7/+22
|\| | | | | | | | | | | | | | | | | | | * commit '41e86146e7240f9d42e8cdb86a94bb3eb2bbe15f': dump: print detailed color space information full color triplets are only printed if they are not all equal, otherwise they are printed as before Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: print detailed color space informationVittorio Giovara2014-10-081-0/+17
| |
* | avcodec: Allow choosing the dump format field separator.Michael Niedermayer2014-10-091-2/+3
| | | | | | | | | | | | The default is to maintain the previous ", " for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8'Michael Niedermayer2014-10-091-4/+12
|\| | | | | | | | | | | | | | | | | | | | | * commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8': dump: split audio and video probing on multiple lines Conflicts: libavcodec/utils.c libavformat/dump.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: split audio and video probing on multiple linesVittorio Giovara2014-10-081-7/+12
| | | | | | | | Also always report pixel format.
* | Merge commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659'Michael Niedermayer2014-10-081-0/+5
|\| | | | | | | | | | | | | * commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659': avcodec: make sure color_range is properly initialized Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: make sure color_range is properly initializedVittorio Giovara2014-10-081-0/+5
| |
* | Merge commit '153fadc390d05aa47e5e2c56290401898fe41a23'Michael Niedermayer2014-10-071-1/+1
|\| | | | | | | | | | | | | * commit '153fadc390d05aa47e5e2c56290401898fe41a23': ff_get_format: fix infinite loop Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ff_get_format: fix infinite loopRémi Denis-Courmont2014-10-061-1/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>