summaryrefslogtreecommitdiff
path: root/libavcodec/h263dec.c
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-091-8/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 '33259118155764ce27a3433894659dda1d148b5f'Michael Niedermayer2014-03-311-2/+2
|\ \ | |/ | | | | | | | | | | * commit '33259118155764ce27a3433894659dda1d148b5f': h263: improve hwaccel #ifdefs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263: improve hwaccel #ifdefsRémi Denis-Courmont2014-03-311-2/+2
| |
* | avcodec/h263dec: Workaround H263 end padding bugMichael Niedermayer2014-03-041-0/+11
| | | | | | | | | | | | Fixes: H263PaddingBugFixVID_6647.MOV Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'Michael Niedermayer2013-11-301-31/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb': mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpeg4videodec Conflicts: libavcodec/h263dec.c libavcodec/mpeg4video.h libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to ↵Anton Khirnov2013-11-291-33/+2
| | | | | | | | mpeg4videodec
| * mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4Anton Khirnov2013-11-291-85/+0
| |
* | avcodec/h263dec: move call to ff_mpeg4_workaround_bugs() under codec_id checkMichael Niedermayer2013-11-301-2/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: move bug workaround code into seperate functionMichael Niedermayer2013-11-301-104/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb'Michael Niedermayer2013-11-291-25/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb': h263dec: remove commented out cruft Conflicts: libavcodec/h263dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: remove commented out cruftAnton Khirnov2013-11-291-25/+1
| |
* | Merge commit '1a89025793ca73d9685a8ce8e3194efa64dd6844'Michael Niedermayer2013-11-291-1/+1
|\ \ | |/ | | | | | | | | | | * commit '1a89025793ca73d9685a8ce8e3194efa64dd6844': mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContextAnton Khirnov2013-11-291-1/+1
| |
* | Merge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72'Michael Niedermayer2013-11-291-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72': mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext Conflicts: libavcodec/h263dec.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContextAnton Khirnov2013-11-291-2/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-281-1/+1
|\ \ | |/ | | | | | | | | | | * qatar/master: h263dec: sanitize a condition. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: sanitize a condition.Anton Khirnov2013-11-271-1/+1
| | | | | | | | | | Call ff_mpeg4_decode_picture_header() only when the decoder has the MPEG4 codec id, not based on a vaguely related value of h263_pred.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-101-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: hwaccel: Simplify ff_find_hwaccel Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: Simplify ff_find_hwaccelLuca Barbato2013-11-101-1/+1
| | | | | | | | It is always called by passing fields from an AVCodecContext.
* | Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'Michael Niedermayer2013-11-081-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '0338c396987c82b41d322630ea9712fe5f9561d6': dsputil: Split off H.263 bits into their own H263DSPContext Conflicts: configure libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off H.263 bits into their own H263DSPContextDiego Biurrun2013-11-081-0/+1
| |
* | Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6'Michael Niedermayer2013-11-011-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '3b086317277e3f3b61c0343930d8e2570b278bd6': h26[13]dec: stop using deprecated avcodec_set_dimensions gifdec: stop using deprecated avcodec_set_dimensions g2meet: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/gifdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h26[13]dec: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-311-1/+3
| |
* | avcodec/h263dec: fix handling of AV_EF_EXPLODEMichael Niedermayer2013-10-281-3/+4
| | | | | | | | | | | | This fixes checking a variable that had been overwritten before. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185'Michael Niedermayer2013-10-281-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185': h263: Check init_get_bits return value Conflicts: libavcodec/h263dec.c See: d47e14b53a3908e5bad82e22129bbd175b49e89b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263: Check init_get_bits return valueMichael Niedermayer2013-10-281-6/+11
| | | | | | | | | | | | | | And use init_get_bits8 to check for integer overflows while at it. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '0749314886390f6ec81d45e0ba424fcb36c945cf'Michael Niedermayer2013-10-281-9/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '0749314886390f6ec81d45e0ba424fcb36c945cf': h263: Return meaningful errors Conflicts: libavcodec/h263dec.c See: 7b62d3415e8e44618cb97775567d453295c4f4d9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263: Return meaningful errorsLuca Barbato2013-10-281-21/+30
| |
* | Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'Michael Niedermayer2013-10-231-319/+354
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7': h263: K&R formatting cosmetics Conflicts: libavcodec/h263dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263: K&R formatting cosmeticsLuca Barbato2013-10-231-322/+361
| | | | | | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | h263dec: use init_get_bits8() and check its return codeMichael Niedermayer2013-10-211-4/+6
| | | | | | | | | | | | Fixes null pointer dereference Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer2013-10-041-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun2013-10-031-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-241-11/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * qatar/master: h263dec: Remove a hack that can cause infinite loops Conflicts: libavcodec/h263dec.c See: d2981b8ef191fc7876e3486e42222ab6a8777c24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: Remove a hack that can cause infinite loopsMartin Storsjö2013-09-231-13/+0
| | | | | | | | | | | | | | | | The actual usefulness of the hack is not known, and it does cause infinite loops with some broken input files. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Fix nonsense MPEG-4 hwaccel code.Reimar Döffinger2013-09-221-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues with the code: 1) The skip_bits_long breaks packed B-frames since we skip of the packed frame, even for VDPAU. 2) Calling ff_h263_find_resync_marker_reverse is nonsense for MPEG-4, and for H.263 the only code using this (vaapi_mpeg4) explicitly reverts this change! 3) mb_x/mb_y are always 0 when vaapi_mpeg4_decode_slice, so doing computations with them is just obfuscation 4) due to not updating mb_y the code would always go into the error resilience case, causing nonsense error messages and maybe further issues. While tested to fix the data provided to the decoder in case of VDPAU so it is the same as for the non-hwaccel code, the VA-API code was not tested to still work, and adding regression testing even as a quick hack is much more complicated for it. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | mpeg4dec: Ensure data is not clobbered too early.Reimar Döffinger2013-09-211-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid overwriting the bitstream buffer data before we have ended processing the frame. This is necessary to fix hwaccels which might try to use the buffer during the end_frame call. I am not sure but it is possible this could even trigger a use-after-free if the av_fast_malloc allocated a new buffer. This would require that decode_slice did not wind the bitstream forward all the way to the end, which does not currently happen in normal streams. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avcodec/h263dec: fix aspect of lead h263 EHCMichael Niedermayer2013-08-241-0/+3
| | | | | | | | | | | | Fixes part of ticket925 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h263dec: use FF_CEIL_RSHIFT()Michael Niedermayer2013-08-241-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg4videodec: fix GEOV/GEOX flipingMichael Niedermayer2013-08-241-0/+15
| | | | | | | | | | Fixes Ticket317 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "Merge commit of 'vdpau: remove old-style decoders'"Michael Niedermayer2013-08-171-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bf36dc50ea448999c8f8c7a35f6139a7040f6275, reversing changes made to b7fc2693c70fe72936e4ce124c802ac23857c476. Conflicts: libavcodec/h264.c Keeping support for the old VDPAU API has been requested by our VDPAU maintainer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'Michael Niedermayer2013-08-061-7/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8': vdpau: remove old-style decoders Conflicts: libavcodec/allcodecs.c libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/vc1dec.c libavcodec/vdpau.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status