aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
| * lavc: remove the locking code in avcodec_close()Anton Khirnov2014-05-181-18/+0
| | | | | | | | | | This function should not modify any global state, so there should be no reason for any locking.
* | avcodec/utils: Fix undefined behavior in avpriv_toupper4Michael Niedermayer2014-05-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'Michael Niedermayer2014-05-121-4/+30
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8': lavc: Add hwaccel private data and init/uninit callbacks Conflicts: libavcodec/avcodec.h libavcodec/internal.h libavcodec/pthread_frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add hwaccel private data and init/uninit callbacksAnton Khirnov2014-05-111-4/+30
| |
* | Merge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'Michael Niedermayer2014-05-121-2/+9
|\| | | | | | | | | | | | | | | | | | | * commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436': hwaccel: Support specific frame allocators Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: Support specific frame allocatorsLuca Barbato2014-05-111-0/+7
| | | | | | | | It would reduce the boilerplate code users have to write.
* | Merge commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'Michael Niedermayer2014-05-111-15/+33
|\| | | | | | | | | | | | | | | | | | | * commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f': lavc: set AVCodecContext.hwaccel in ff_get_format() Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: set AVCodecContext.hwaccel in ff_get_format()Anton Khirnov2014-05-111-15/+33
| | | | | | | | This way each decoder does not have to do the same thing manually.
* | Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'Michael Niedermayer2014-05-111-1/+6
|\| | | | | | | | | | | | | | | | | | | | | * commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425': lavc: Add an internal wrapper around get_format() Conflicts: libavcodec/h264_slice.c libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add an internal wrapper around get_format()Anton Khirnov2014-05-111-0/+5
| | | | | | | | It will be useful in the following commits.
| * lavc: do not use AVCodecContext.codec_name in avcodec_string()Anton Khirnov2014-05-011-2/+0
| | | | | | | | That field will be deprecated.
* | avcodec/utils/ff_init_buffer_info factor avctx->internal->pkt; outMichael Niedermayer2014-05-011-6/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: merge ff_decode_frame_props() and ff_init_buffer_info()Michael Niedermayer2014-05-011-26/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: ff_decode_frame_props: set pkt_sizeMichael Niedermayer2014-05-011-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: use av_malloc(z)_array()Michael Niedermayer2014-04-251-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'Michael Niedermayer2014-04-191-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '86a0432688216562926d4aee36118f01be6d5e1b': Silicon Graphics Motion Video Compressor 1 & 2 decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/mvcdec.c libavcodec/version.h See: 746b1dcc98b466e4abd301f304127583722ad80b Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'Michael Niedermayer2014-04-191-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee': Silicon Graphics RLE 8-bit video decoder Conflicts: Changelog doc/general.texi libavcodec/avcodec.h libavcodec/sgirledec.c libavcodec/version.h See: afa1617b937f3675f74c6351a46c45f8c24d67f2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6ef96292d99302a59f824713fc763f6abd3754df'Michael Niedermayer2014-04-191-0/+1
|\| | | | | | | | | | | | | * commit '6ef96292d99302a59f824713fc763f6abd3754df': utils: add yvyu422 to avcodec_align_dimensions2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * utils: add yvyu422 to avcodec_align_dimensions2Vittorio Giovara2014-04-191-0/+1
| |
* | Direct Stream Digital (DSD) decoderPeter Ross2014-04-151-0/+4
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: prettify remap_deprecated_codec_id()Michael Niedermayer2014-04-131-16/+16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-091-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo: operate with pointers to AVFrames instead of whole structs Conflicts: libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/intrax8.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/mpegvideo_xvmc.c libavcodec/msmpeg4.c libavcodec/ratecontrol.c libavcodec/vaapi.c libavcodec/vc1dec.c libavcodec/vdpau_vc1.c See: fc567ac49e17151f00f31b59030cd10f952612ef Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: operate with pointers to AVFrames instead of whole structswm42014-04-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The most interesting parts are initialization in ff_MPV_common_init() and uninitialization in ff_MPV_common_end(). ff_mpeg_unref_picture and ff_thread_release_buffer have additional NULL checks for Picture.f, because these functions can be called on uninitialized or partially initialized Pictures. NULL pointer checks are added to ff_thread_release_buffer() stub function. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89'Michael Niedermayer2014-04-061-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f273093e54cba130f3ffde3d6433e74baa4ad89': LucasArts SMUSH VIMA audio decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavcodec/vima.c This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition to the previously used name "vima" These changes are needed for compatibility with the renamed codec in libav See: b18357326ca1522d7fb7f4276ddebfccc29ce72c and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'Michael Niedermayer2014-04-061-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2': LucasArts SMUSH SANM video decoder Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/sanm.c libavcodec/version.h See: 69254f46286099588514454f60fad12f6e51b2cd and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'Michael Niedermayer2014-04-041-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac4b32df71bd932838043a4838b86d11e169707f': On2 VP7 decoder Conflicts: Changelog libavcodec/arm/h264pred_init_arm.c libavcodec/arm/vp8dsp.h libavcodec/arm/vp8dsp_init_arm.c libavcodec/arm/vp8dsp_init_armv6.c libavcodec/arm/vp8dsp_init_neon.c libavcodec/avcodec.h libavcodec/h264pred.c libavcodec/version.h libavcodec/vp8.c libavcodec/vp8.h libavcodec/vp8data.h libavcodec/vp8dsp.c libavcodec/vp8dsp.h libavcodec/x86/h264_intrapred_init.c libavcodec/x86/vp8dsp_init.c See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'Michael Niedermayer2014-04-011-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38389058c3308758c6365abd0f6b45c5e62bb90b': OpenEXR decoder Conflicts: Changelog configure libavcodec/Makefile libavcodec/avcodec.h libavcodec/exr.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'Michael Niedermayer2014-03-281-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033': PAF demuxer and decoder Conflicts: Changelog doc/general.texi libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/paf.c libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/paf.c libavformat/version.h See: 7de4a16508cb9bd2d40855f7114dea14329ef62a, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'Michael Niedermayer2014-03-271-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ae17878fb2ab100264226c84c58f5b95a703312f': BRender PIX image decoder Conflicts: doc/general.texi libavcodec/Makefile libavcodec/version.h See: 492a5f835c59ab7c2e347d3579d8bf6148ae0a0, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f'Michael Niedermayer2014-03-241-5/+34
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '4a0f6651434c6f213d830140f575b4ec7858519f': libavcodec: when decoding, copy replaygain side data to decoded frames Conflicts: libavcodec/internal.h libavcodec/rawdec.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavcodec: when decoding, copy replaygain side data to decoded framesAnton Khirnov2014-03-241-7/+34
| |
* | Move avpriv_find_pix_fmt() to utils.cMichael Niedermayer2014-03-231-0/+12
| | | | | | | | | | | | Fixes build with --disable-everything Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: Add padding after the remaining AVFramesMichael Niedermayer2014-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | This limits ABI issues in case libavcodec is linked to a libavutil with larger AVFrame Which can happen if they are shiped in seperate binary packages and libavutil is upgraded A cleaner alternative would be to replace them by pointers but this would likely cause a small speedloss Signed-off-by: Michael Niedermayer <michaelni@gmx.at>