aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
| * lavc: do not allocate edges in the default get_buffer2()Anton Khirnov2014-06-261-21/+1
| |
* | avcodec/utils: check sar only when width/height are setMichael Niedermayer2014-06-201-1/+2
| | | | | | | | | | | | This fixes loosing the perfectly valid SAR when width=height=0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'Michael Niedermayer2014-06-201-0/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2': Add av_image_check_sar() and use it to validate SAR Conflicts: libavcodec/dpx.c libavcodec/dvdec.c libavcodec/ffv1dec.c libavcodec/utils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add av_image_check_sar() and use it to validate SARJustin Ruggles2014-06-201-0/+33
| |
* | Loose mplayer in MPlayer/incoming/Michael Niedermayer2014-06-031-1/+1
| | | | | | | | | | Found-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add direct link to ML in missing_feature_sample()Michael Niedermayer2014-06-031-1/+1
| | | | | | | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils/ff_init_buffer_info: Favor color information from AVFrame if ↵Michael Niedermayer2014-06-031-3/+6
| | | | | | | | | | | | available Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'eb800f120d2d42590fde2302fe828c847e41e773'Michael Niedermayer2014-06-011-4/+10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'eb800f120d2d42590fde2302fe828c847e41e773': libavcodec: set AVFrame colorspace fields on decoding Conflicts: libavcodec/utils.c See: a80e622924c89df69fb1c225ba432fe12fe6648e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavcodec: set AVFrame colorspace fields on decodingwm42014-06-011-0/+7
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Fix VDPAU decoders, regression since f2f99f07.Carl Eugen Hoyos2014-05-301-1/+2
| |
* | avcodec/utils: add error message for the recode_subtitle() without iconv caseMichael Niedermayer2014-05-211-0/+1
| | | | | | | | | | | | Based on the assert command which was removed in ef0c466a0fef4657d3f46cc9adea97e76a8e4faa Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Replace assert with AVERROR when recode_subtitle called w/o ICONV.Dale Curtis2014-05-211-1/+1
| | | | | | | | | | | | | | | | recode_subtitle() is called implicitly by avformat_find_stream_info(). As such, clients which disable ICONV always crash if a file contains subtitles; even if they don't care about them. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix compilation errors when deprecated features are disabled.Dale Curtis2014-05-201-0/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: remove no longer needed ff_codec_close_recursive()Michael Niedermayer2014-05-201-9/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'Michael Niedermayer2014-05-191-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834': Add transformation matrix API. Conflicts: libavcodec/avcodec.h libavcodec/utils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add transformation matrix API.Vittorio Giovara2014-05-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | Add AV_PKT_DATA_DISPLAYMATRIX and AV_FRAME_DATA_DISPLAYMATRIX as stream and frame side data (respectively) to describe a display transformation matrix for linear transformation operations on the decoded video. Add functions to easily extract a rotation angle from a matrix and conversely to setup a matrix for a given rotation angle. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'e1b66778b6ee82a192b5895e23c4e135f7269326'Michael Niedermayer2014-05-181-12/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e1b66778b6ee82a192b5895e23c4e135f7269326': lavc: remove the locking code in avcodec_close() Conflicts: libavcodec/utils.c Note, if someone knows of a external codec lib/API, hwaccel or other that requires locking on its close/free side, please contact ffmpeg-devel. Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-15 11:51:20 +0000