summaryrefslogtreecommitdiff
path: root/libavcodec/h263dec.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '925b80d64029d41962e5998d7d901226c3a9baea'Michael Niedermayer2015-06-081-0/+1
|\ | | | | | | | | | | | | * commit '925b80d64029d41962e5998d7d901226c3a9baea': mpegvideo: Move OutFormat enum to mpegutils.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move OutFormat enum to mpegutils.hVittorio Giovara2015-06-081-0/+1
| | | | | | | | It is necessary to avoid circular header dependencies.
* | Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'Michael Niedermayer2015-06-011-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '2f15846ad7ad57beb0bca99c624affa0facf284b': mpegvideo: wmv2: Move function declarations Conflicts: libavcodec/wmv2.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: wmv2: Move function declarationsVittorio Giovara2015-05-311-0/+1
| |
* | avcodec/vdpau: Re-factor pre-hwaccel helper functions into separate headerPhilip Langdale2015-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | h264.h and hevc.h are mutually exclusive due to defining some of the same names. As such, we need to avoid forcing h264.h to be included if we want hevc decode acceleration to be possible. However, some of the pre-hwaccel helper functions need h264.h. To avoid messy collisions, let's move the declaration of all those helpers to a separate header which we will exclude for the hevc support (which will be hwaccel-only). Signed-off-by: Philip Langdale <philipl@overt.org>
* | Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'Michael Niedermayer2015-05-221-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '4e17946f10d39eec6cc03fb249ae8147373141b6': mpegvideo: Rework various functions not to use MpegEncContext directly Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Rework various functions not to use MpegEncContext directlyVittorio Giovara2015-05-221-1/+1
| |
* | Merge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193'Michael Niedermayer2015-05-221-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpegvideo: Drop err_recognitionVittorio Giovara2015-05-221-1/+1
| | | | | | | | It is just a duplicate of an AVCodecContext member so use it instead.
* | Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'Michael Niedermayer2015-05-221-5/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpegvideo: Drop flags and flags2Vittorio Giovara2015-05-221-5/+2
| | | | | | | | They are just duplicates of AVCodecContext members so use those instead.
* | lavc/h263: Set color_range for gray decoding.Carl Eugen Hoyos2015-05-171-1/+4
| |
* | avcodec/h263dec: use PIX_FMT_GRAY8 when the user specified CODEC_FLAG_GRAYMichael Niedermayer2015-05-091-0/+3
| | | | | | | | | | | | Fixes Ticket4542 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845'Michael Niedermayer2015-04-291-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845': h263: Convert function to macro Conflicts: libavcodec/h263.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263: Convert function to macroVittorio Giovara2015-04-281-1/+1
| |
* | Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'Michael Niedermayer2015-04-201-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: Replace av_dlog and tprintf with internal macrosVittorio Giovara2015-04-191-1/+1
| |
* | mpeg4: use a self-explanatory #define MAX_NVOP_SIZEAndreas Cadhalpun2015-04-041-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h263dec: Try to use codec_tag instead of the stream_codec_tagMichael Niedermayer2015-01-271-2/+3
| | | | | | | | | | | | If this causes problems then the stream_codec_tag should be enabled again Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c80a816142699dea9cf9fa66689a7838a487ed7e'Michael Niedermayer2014-10-141-0/+6
|\ \ | |/ | | | | | | | | | | * commit 'c80a816142699dea9cf9fa66689a7838a487ed7e': h263dec: call get_format() on resolution changes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: call get_format() on resolution changesRémi Denis-Courmont2014-10-131-0/+6
| | | | | | | | Fail safe if the pixel format changes.
* | Merge commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9'Michael Niedermayer2014-10-131-5/+12
|\ \ | |/ | | | | | | | | | | * commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9': h263dec: call get_format after setting resolution and profile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: call get_format after setting resolution and profileRémi Denis-Courmont2014-10-131-5/+12
| | | | | | | | Bug-Id: 541
* | Merge commit '9a03c2323593173a201cb75edd1b49887cf811ed'Michael Niedermayer2014-10-071-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '9a03c2323593173a201cb75edd1b49887cf811ed': h263dec: Force padding bug workaround for H.263. This is not merged as it breaks a good part of the error concealment/resilience for H.263 Also, messenger.h263 plays fine in ffmpeg. If anyone has any other h263 files that do not work, please open an issue on trak or mail me! See: d225b0f7aaa65eafccc87165130e1c4bab71708b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: Force padding bug workaround for H.263.Josh Allmann2014-10-071-1/+2
| | | | | | | | | | | | Fixes decoding of http://samples.mplayerhq.hu/V-codecs/h263/h263-raw/messenger.h263 Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/h263dec: Fix decoding messenger.h263Michael Niedermayer2014-10-031-0/+8
| | | | | | | | | | | | | | | | Fixes http://samples.mplayerhq.hu/V-codecs/h263/h263-raw/messenger.h263 Fixes regression since b239f3f6 Found-by: Josh Allmann Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Factor ff_mpv_decode_init() outMichael Niedermayer2014-09-051-4/+2
| | | | | | | | | | Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-151-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-151-2/+2
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'Michael Niedermayer2014-08-151-12/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '835f798c7d20bca89eb4f3593846251ad0d84e4b': mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes Conflicts: libavcodec/h261dec.c libavcodec/intrax8.c libavcodec/mjpegenc.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/x86/mpegvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixesDiego Biurrun2014-08-151-12/+12
| |
* | Merge commit 'b869eea7ea8f5d8331fcd6355f848bb6a6e06b14'Michael Niedermayer2014-08-151-13/+12
|\ \ | |/ | | | | | | | | | | * commit 'b869eea7ea8f5d8331fcd6355f848bb6a6e06b14': h263dec: Fix order of initialization Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: Fix order of initializationJohn Stebbins2014-08-141-13/+12
| | | | | | | | | | ff_MPV_common_init requires the frame dimensions which get parsed in *_decode_picture_header.
* | Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'Michael Niedermayer2014-08-151-2/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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>
| * idct: remove call to ff_idctdsp_init from ff_MPV_common_initJohn Stebbins2014-08-141-2/+6
| | | | | | | | | | One step in untangling the mpegvideo code and fixing some problems in the order that initialization is being done in h263dec and h261dec.
* | Merge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e'Michael Niedermayer2014-06-231-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '7b9ef8d701c319c26f7d0664fe977e176764c74e': mpeg: Split error resilience bits off into a separate file Conflicts: configure libavcodec/Makefile libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg: Split error resilience bits off into a separate fileDiego Biurrun2014-06-221-0/+1
| |
* | Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'Michael Niedermayer2014-06-201-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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/+2
| |
* | Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'Michael Niedermayer2014-05-301-4/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * dsputil: Split off quarterpel bits into their own contextDiego Biurrun2014-05-291-7/+9
| |
* | Merge commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'Michael Niedermayer2014-05-111-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-1/+0
| | | | | | | | This way each decoder does not have to do the same thing manually.
* | Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'Michael Niedermayer2014-05-111-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-1/+1
| | | | | | | | It will be useful in the following commits.
* | avcodec/h263dec: use AV_EF_IGNORE_ERRMichael Niedermayer2014-05-041-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h263dec: fix "incompatible pointer type" warningMichael Niedermayer2014-05-031-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h263dec: print MB position for each MB when TRACE is enabledMichael Niedermayer2014-05-021-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status