aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
* | Merge commit '577899a6458ccad9026eb268f10dc0b39c224c8d'Michael Niedermayer2014-10-061-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '577899a6458ccad9026eb268f10dc0b39c224c8d': lavc: specify the behavior of av_lockmgr_register on failure. Conflicts: libavcodec/avcodec.h libavcodec/utils.c libavcodec/version.h See: a950edb472e8823e34832c7313ba447b2db76f27 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: specify the behavior of av_lockmgr_register on failure.Manfred Georg2014-10-061-12/+24
| | | | | | | | | | | | | | | | | | | | | | The register function now specifies that the user callback should leave things in the same state that it found them on failure but that failure to destroy is ignored by the library. The register function is now explicit about its behavior on failure (it unregisters the previous callback and destroys all mutex). Signed-off-by: Manfred Georg <mgeorg@google.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/utils: Add case for jv to avcodec_align_dimensions2()Michael Niedermayer2014-10-031-0/+4
| | | | | | | | | | | | | | | | Fixes out of array accesses Fixes: asan_heap-oob_12304aa_8_asan_heap-oob_4da4f3_300_intro.jv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: av_lockmgr_register defines behavior on failure.Manfred Georg2014-10-021-12/+22
| | | | | | | | | | | | | | | | | | | | The register function now specifies that the user callback should leave things in the same state that it found them on failure but that failure to destroy is ignored by the library. The register function is now explicit about its behavior on failure (it unregisters the previous callback and destroys all mutex). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec, avutil: allow more control about how samples are skippedwm42014-10-021-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CODEC_FLAG2_SKIP_MANUAL (exposed as "skip_manual"), which makes the decoder export sample skip information via side data, instead of applying it automatically. The format of the side data is the same as AV_PKT_DATA_SKIP_SAMPLES, but since AVPacket and AVFrame side data constants overlap, AV_FRAME_DATA_SKIP_SAMPLES needs to be introduced. This is useful for applications which want to do the timestamp calculations manually, or which actually want to retrieve the padding. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Force mutex to NULL after destruction.Manfred Georg2014-10-011-0/+2
| | | | | | | | | | | | A badly behaving user provided mutex manager (such as that in OpenCV) may not reset the mutex to NULL on destruction. This can cause a problem for a later mutex manager (which may assert that the mutex is NULL before creating). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Fix off by 1 error causing unneeded allocation in ↵Michael Niedermayer2014-09-291-1/+1
| | | | | | | | | | | | | | ff_fast_malloc() Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'Michael Niedermayer2014-09-271-30/+67
|\| | | | | | | | | | | | | | | | | | | * commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2': hwaccel: Call ->get_format again if hwaccel init fails Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: Call ->get_format again if hwaccel init failsRémi Denis-Courmont2014-09-261-31/+67
| | | | | | | | | | | | | | This allows the application to fall back on another hwaccel or, more likely, software decoding. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avcodec/utils: remove avcodec_ prefix for internal symbolClément Bœsch2014-09-141-2/+2
| |
* | Print the actual bit depth for audio if it is different from the sample_fmt ↵Carl Eugen Hoyos2014-09-081-0/+4
| | | | | | | | | | | | bit depth. This is already done for video.
* | Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'Michael Niedermayer2014-08-281-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '9301486408a480629336af4d7fd873c0f28fb2d5': avcodec: add stream-level stereo3d side data Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/utils.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: add stream-level stereo3d side dataVittorio Giovara2014-08-281-0/+9
| |
* | avcodec/utils: add GBRP16 to avcodec_align_dimensions2()Michael Niedermayer2014-08-241-0/+2
| | | | | | | | | | | | Fixes Ticket3869 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: add codecview filterClément Bœsch2014-08-241-0/+6
| |
* | Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer2014-08-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867': cosmetics: Write NULL pointer inequality checks more compactly Conflicts: libavcodec/dvdsubdec.c libavcodec/h263dec.c libavcodec/libxvid.c libavcodec/rv10.c libavcodec/utils.c libavformat/format.c libavformat/matroskadec.c libavformat/segment.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-151-2/+2
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-151-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Move WMA case from ff_get_audio_frame_size() to av_get_audio_frame_duration()Michael Niedermayer2014-08-141-0/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Move frame_size fallback from ff_get_audio_frame_size() to ↵Michael Niedermayer2014-08-141-0/+4
| | | | | | | | | | | | av_get_audio_frame_duration() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e'Michael Niedermayer2014-08-101-18/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e': lavc: drop the av_fast_{re,m}alloc compatibility wrappers Conflicts: libavcodec/utils.c See: a973e01501bc3ca5c61d778f97f350837d4ed481 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: drop the av_fast_{re,m}alloc compatibility wrappersAnton Khirnov2014-08-101-12/+0
| | | | | | | | They were only needed until the bump.
* | Revert "lavc/utils: Do not require dimensions for PNG."Derek Buitenhuis2014-08-101-3/+1
| | | | | | | | | | | | | | | | | | | | mplayer-specifc hacks should not be in our codebase. mplayer should fix its own code. It is not our responsibility to work around their broken code. This reverts commit e8e575633faf19711910cf9caf59f7db300a9ccd. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '472f9ed312ec784f7c72876b77163f4741880d05'Michael Niedermayer2014-08-101-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '472f9ed312ec784f7c72876b77163f4741880d05': Remove obsolete FF_API_AVFRAME_COLORSPACE cruft. Conflicts: libavcodec/utils.c libavutil/frame.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.Anton Khirnov2014-08-091-2/+0
| |
* | Merge commit '53abe32409f13687c864b3cda077a1aa906a2459'Michael Niedermayer2014-07-271-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '53abe32409f13687c864b3cda077a1aa906a2459': avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as constDiego Biurrun2014-07-261-1/+1
| |
| * build: Add define for SIMD extensions requiring 16-byte aligned buffersDiego Biurrun2014-07-221-1/+1
| |
* | Merge commit '2d60444331fca1910510038dd3817bea885c2367'Michael Niedermayer2014-07-171-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d60444331fca1910510038dd3817bea885c2367': dsputil: Split motion estimation compare bits off into their own context Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile libavcodec/dvenc.c libavcodec/error_resilience.c libavcodec/h264.h libavcodec/h264_slice.c libavcodec/me_cmp.c libavcodec/me_cmp.h libavcodec/motion_est.c libavcodec/motion_est_template.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split motion estimation compare bits off into their own contextDiego Biurrun2014-07-171-3/+3
| |
* | Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'Michael Niedermayer2014-07-071-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b': dsputil: Move draw_edges() to mpegvideoencdsp Conflicts: libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move draw_edges() to mpegvideoencdspDiego Biurrun2014-07-061-0/+1
| |
* | Merge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443'Michael Niedermayer2014-06-261-22/+1
|\| | | | | | | | | | | | | | | | | | | * commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443': lavc: do not allocate edges in the default get_buffer2() Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-20 05:19:19 +0000