Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4videodec.c
AgeCommit message (Collapse)Author
2015-08-18lavc: move vdpau decoders under FF_API_VDPAU.wm4
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2015-08-18mpeg4video: use ff_dlog instead of av_log under debug&FF_DEBUG_PTS.Ronald S. Bultje
This fixes compilation with FF_API_UNUSED_MEMBERS=0.
2015-08-18FF_OPT_TYPE_* -> AV_OPT_TYPE_*.Ronald S. Bultje
2015-07-27Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer
* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: AV-prefix all codec capabilitiesVittorio Giovara
Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27lavc: AV-prefix all codec flagsVittorio Giovara
Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-15avcodec/mpeg4videodec: Clarify the mpeg4_unpack_bframes reference.Michael Niedermayer
This should avoid misunderstandings like in Ticket4618 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-11avcodec/mpeg4videodec: Check P cbpyMichael Niedermayer
Fixes undefined behavior Fixes: signal_sigsegv_c3097a_991_xtrem_e2_m64q15_a32sxx.3gp Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-06-11avcodec/mpeg4videodec: Mark static table as constMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-01Merge commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61'Michael Niedermayer
* commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61': mpegvideo: Move tables to a separate file Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-31mpegvideo: Move tables to a separate fileVittorio Giovara
2015-05-29avcodec/mpegvideo: Reset bitstream_buffer_size on allocation failureMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-28Merge commit '6f57375d707de40dcec28d3cef886c364e032c21'Michael Niedermayer
* commit '6f57375d707de40dcec28d3cef886c364e032c21': rl: Rename ff_*_rl() to ff_rl_*() Conflicts: libavcodec/mpeg4videodec.c libavcodec/rl.c libavcodec/rl.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-28rl: Rename ff_*_rl() to ff_rl_*()Anton Khirnov
2015-05-22Merge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193'Michael Niedermayer
* commit '9c1db92ad372d4cd69e0490e691c56e4097cb193': mpegvideo: Drop err_recognition Conflicts: libavcodec/h263dec.c libavcodec/ituh263dec.c libavcodec/mpeg4video.h libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'Michael Niedermayer
* commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42': mpegvideo: Drop flags and flags2 Conflicts: libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/ratecontrol.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22mpegvideo: Drop err_recognitionVittorio Giovara
It is just a duplicate of an AVCodecContext member so use it instead.
2015-05-22mpegvideo: Drop flags and flags2Vittorio Giovara
They are just duplicates of AVCodecContext members so use those instead.
2015-04-22mpeg4videodec: only allow a positive lengthAndreas Cadhalpun
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'Michael Niedermayer
* commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25': lavc: Replace av_dlog and tprintf with internal macros Conflicts: libavcodec/aacdec.c libavcodec/audio_frame_queue.c libavcodec/bitstream.c libavcodec/dcadec.c libavcodec/dnxhddec.c libavcodec/dvbsubdec.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/get_bits.h libavcodec/gifdec.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/imc.c libavcodec/interplayvideo.c libavcodec/jpeglsdec.c libavcodec/libopencore-amr.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_parser.c libavcodec/pngdec.c libavcodec/ratecontrol.c libavcodec/rv10.c libavcodec/svq1dec.c libavcodec/vqavideo.c libavcodec/wmadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-19avcodec/mpeg4videodec: Use check_marker()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-14avcodec/mpeg4videodec: Improve wording of the missing header warning messagesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-14avcodec/mpeg4videodec: change log level to waning for incomplete header messagesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-14mpeg4videodec: Remove useless messageswm4
They seem to sometimes trigger with old AVI files. They are just confusing, do not help anyone, and use sloppy language. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-04-05mpeg4: suggest mpeg4_unpack_bframes bsf instead of avidemux/VirtualDubAndreas Cadhalpun
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03mpeg4: only show the divx_packed warning, when a packed frame is presentAndreas Cadhalpun
Otherwise it is shown even after the file was fixed with avidemux, because the userdata string still ends with 'p'. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0'Michael Niedermayer
* commit 'f771b3ab5d3c0b763ee356152be550f4121babd0': avidec: do not export stream_codec_tag Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27avidec: do not export stream_codec_tagAnton Khirnov
Handle its only existing use case internally.
2014-11-15avcodec/mpeg4videodec: replace some return -1 by more specific error codesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15avcodec/mpeg4videodec: forward return code in ff_mpeg4_decode_picture_header()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01mpeg4vdpau: Fix priv data size.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-10-15Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41'Michael Niedermayer
* 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>
2014-10-15lavc: deprecate the use of AVCodecContext.time_base for decodingAnton Khirnov
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.
2014-09-08avcodec/mpeg4videodec: fix 'libavcodec/mpeg4videodec.c:2762:22: warning: ↵Michael Niedermayer
unused variable mpeg4_vdpau_class [-Wunused-const-variable]' Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03avcodec/mpeg4videodec: fix automatic use of the xvid idct on non x86Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5'Michael Niedermayer
* commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5': mpeg4videodec: Fix low_delay error message Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01mpeg4videodec: Fix low_delay error messageGabriel Dume
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-27Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'Michael Niedermayer
* commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5': cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs Conflicts: libavcodec/mpeg4videodec.c libavcodec/x86/Makefile libavcodec/x86/dct-test.c libavcodec/x86/xvididct_sse2.c libavcodec/xvididct.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTsDiego Biurrun
2014-08-15Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'Michael Niedermayer
* commit '998c9f15d1ca8c7489775ebcca51623b915988f1': idct: remove call to ff_idctdsp_init from ff_MPV_common_init Conflicts: libavcodec/dnxhdenc.c libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10avcodec: remove deprecated use of FF_IDCT_XVIDMMXMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit eedc3f36532e4c6de782fe1c2dc59d192418a8fc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04Merge commit 'f89d76c10355242c39b08f253c1d1524f45ef778'Michael Niedermayer
* commit 'f89d76c10355242c39b08f253c1d1524f45ef778': mpeg4video: Initialize xvididct for all threads Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04mpeg4video: Initialize xvididct for all threadsAnton Khirnov
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-01Merge commit 'a786c8259dafeca9744252230b5d78f67810770c'Michael Niedermayer
* commit 'a786c8259dafeca9744252230b5d78f67810770c': idct: Split off Xvid IDCT Conflicts: libavcodec/Makefile libavcodec/mpeg4videodec.c libavcodec/x86/Makefile libavcodec/x86/idctdsp_init.c This split is somewhat restructured leaving the xvid IDCT available outside mpeg4 if manually selected. The code also could not be merged unchanged as it conflicted with a bugfix in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-01idct: Split off Xvid IDCTDiego Biurrun
The Xvid IDCT is only required to decode some Xvid-encoded MPEG-4 files, so there is no point in having it as an unconditional part of idctdsp.
2014-07-29Merge commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e'Michael Niedermayer
* commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e': mpegvideo: move vol_control_parameters to the only place it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29mpegvideo: move vol_control_parameters to the only place it is usedNidhi Makhijani
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-01Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer
* commit 'e3fcb14347466095839c2a3c47ebecff02da891e': dsputil: Split off IDCT bits into their own context Conflicts: configure libavcodec/aic.c libavcodec/arm/Makefile libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/asvdec.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dvdec.c libavcodec/dxva2_mpeg2.c libavcodec/intrax8.c libavcodec/mdec.c libavcodec/mjpegdec.c libavcodec/mjpegenc_common.h libavcodec/mpegvideo.c libavcodec/ppc/dsputil_altivec.h libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/idctdsp.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>
2014-06-30dsputil: Split off IDCT bits into their own contextDiego Biurrun
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 02:01:10 +0300