summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4videodec.c
Commit message (Collapse)AuthorAge
* mpeg4videodec: only allow a positive lengthAndreas Cadhalpun2015-04-22
| | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'Michael Niedermayer2015-04-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpeg4videodec: Remove useless messageswm42015-04-14
| | | | | | | | | | | | | | 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>
* | avcodec/mpeg4videodec: Use check_marker()Michael Niedermayer2015-04-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: Improve wording of the missing header warning messagesMichael Niedermayer2015-04-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: change log level to waning for incomplete header messagesMichael Niedermayer2015-04-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg4: suggest mpeg4_unpack_bframes bsf instead of avidemux/VirtualDubAndreas Cadhalpun2015-04-05
| | | | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg4: only show the divx_packed warning, when a packed frame is presentAndreas Cadhalpun2015-04-03
| | | | | | | | | | | | | | | | 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>
* | Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | * commit 'f771b3ab5d3c0b763ee356152be550f4121babd0': avidec: do not export stream_codec_tag Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avidec: do not export stream_codec_tagAnton Khirnov2015-01-27
| | | | | | | | Handle its only existing use case internally.
* | avcodec/mpeg4videodec: replace some return -1 by more specific error codesMichael Niedermayer2014-11-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: forward return code in ff_mpeg4_decode_picture_header()Michael Niedermayer2014-11-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg4vdpau: Fix priv data size.Reimar Döffinger2014-11-01
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41'Michael Niedermayer2014-10-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-15
| | | | | | | | | | | | | | | | | | | | | | 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.
* | avcodec/mpeg4videodec: fix 'libavcodec/mpeg4videodec.c:2762:22: warning: ↵Michael Niedermayer2014-09-08
| | | | | | | | | | | | unused variable mpeg4_vdpau_class [-Wunused-const-variable]' Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: fix automatic use of the xvid idct on non x86Michael Niedermayer2014-09-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5'Michael Niedermayer2014-09-01
|\| | | | | | | | | | | | | * commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5': mpeg4videodec: Fix low_delay error message Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: Fix low_delay error messageGabriel Dume2014-09-01
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'Michael Niedermayer2014-08-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTsDiego Biurrun2014-08-27
| |
* | Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | avcodec: remove deprecated use of FF_IDCT_XVIDMMXMichael Niedermayer2014-08-09
| | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit eedc3f36532e4c6de782fe1c2dc59d192418a8fc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f89d76c10355242c39b08f253c1d1524f45ef778'Michael Niedermayer2014-08-04
|\| | | | | | | | | | | | | | | | | | | * commit 'f89d76c10355242c39b08f253c1d1524f45ef778': mpeg4video: Initialize xvididct for all threads Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4video: Initialize xvididct for all threadsAnton Khirnov2014-08-03
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'a786c8259dafeca9744252230b5d78f67810770c'Michael Niedermayer2014-08-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * idct: Split off Xvid IDCTDiego Biurrun2014-08-01
| | | | | | | | | | 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.
* | Merge commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e'Michael Niedermayer2014-07-29
|\| | | | | | | | | | | | | * commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e': mpegvideo: move vol_control_parameters to the only place it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move vol_control_parameters to the only place it is usedNidhi Makhijani2014-07-29
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer2014-07-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * dsputil: Split off IDCT bits into their own contextDiego Biurrun2014-06-30
| |
* | Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'Michael Niedermayer2014-06-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9': dsputil: Split clear_block*/fill_block* off into a separate context Conflicts: configure libavcodec/asvdec.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dsputil.h libavcodec/eamad.c libavcodec/intrax8.c libavcodec/mjpegdec.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split clear_block*/fill_block* off into a separate contextDiego Biurrun2014-06-18
| |
* | Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'Michael Niedermayer2014-05-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '368f50359eb328b0b9d67451f56fda20b3255f9a': dsputil: Split off quarterpel bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/vc1dec.c libavcodec/vc1dsp.c libavcodec/x86/dsputil_init.c libavcodec/x86/qpeldsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: better level/index printingMatthew Lindner2014-05-09
| |
* | avcodec/mpeg4videodec: print run/level/index valuesMichael Niedermayer2014-05-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: fix mcbpc error messagesMichael Niedermayer2014-05-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h263dec: use AV_EF_IGNORE_ERRMichael Niedermayer2014-05-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix overriden typosMichael Niedermayer2014-04-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b': mpegvideo: move mpegvideo formats-related defines to mpegutils.h Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_mvpred.h libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move mpegvideo formats-related defines to mpegutils.hVittorio Giovara2014-03-16
| |
| * xvid: switch to xvid mmx idct as soon as possibleJanne Grunau2014-01-31
| | | | | | | | | | | | | | The idct implementation cannot be changed after the quantization matrices are read since it use a different permutaion. Bug-Id: videolan/7411
* | avcodec/mpeg4videodec: Check for bitstream overread in decode_vol_header()Michael Niedermayer2014-02-20
| | | | | | | | | | | | | | Fixes out of array read Fixes: 08e48e9daae7d8f8ab6dbe3919e797e5-asan_heap-oob_157461c_5295_cov_1266798650_firefing.mpg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: set field durations to safe values when they are invalidMichael Niedermayer2014-02-19
| | | | | | | | | | | | | | Fixes division by 0 Fixes: 3c980274cecaca6ca5d6e517c0c1983e-signal_sigabrt_7ffff7125425_410_cov_3621042467_2_audio_streams.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: use av_fast_padded_malloc() for bitstream bufferMichael Niedermayer2014-01-07
| | | | | | | | | | | | Fixes use of uninitialized memory with vlc (sample from ticket3277) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | * commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55': mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-12-05
| |
* | Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | * commit 'f7d228676cb7669059889c4225c8a8dc56708c24': mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-12-05
| |
* | Merge commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | * commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2': mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 06:39:35 +0000