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/mpeg4video.h
AgeCommit message (Collapse)Author
2019-03-12avcodec/mpeg4videodec: Fix nonsense warningAndreas Rheinhardt
Since db772308941a2a338c7809f90d347219a6a93074 parsing of mpeg4-extradata lead to a "Failed to parse extradata" warning, because ff_mpeg4_decode_picture_header returns AVERROR_INVALIDDATA in case that no VOP was found. This patch adds a parameter to signify whether a header (where the absence of a VOP does not raise an error) or not is parsed. The first mode is of course used for parsing headers. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-05-17avcodec/mpeg4video: Detect reference studio streams as studio streamsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-02mpeg4video: Add support for MPEG-4 Simple Studio Profile.Kieran Kunhya
This is a profile supporting > 8-bit video and has a higher quality DCT
2018-03-26avcodec/mpeg4videodec: Use more specific error codesMichael Niedermayer
Forward error codes where possible. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-21avcodec/mpeg4videodec: Add support for parsing and exporting video_rangeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-02-24Merge commit '29c2d06d67724e994980045afa055c6c34611b30'Derek Buitenhuis
* commit '29c2d06d67724e994980045afa055c6c34611b30': cosmetics: Drop empty comment lines Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-18cosmetics: Drop empty comment linesDiego Biurrun
2016-01-12avcodec/mpeg4video: Check time_incrMichael Niedermayer
Fixes assertion failure Fixes out of memory access Fixes: test_casex.ivf Found-by: Tyson Smith <twsmith@mozilla.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-05-24avcodec/mpeg4video: Reorder operations to reduce accesses to err_recognitionMichael Niedermayer
About 9 cpu cycle faster mpeg4_decode_mb() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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-22mpegvideo: Drop err_recognitionVittorio Giovara
It is just a duplicate of an AVCodecContext member so use it instead.
2015-04-04mpeg4: use a self-explanatory #define MAX_NVOP_SIZEAndreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14Merge commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7'Michael Niedermayer
* commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7': mpeg4video: Fix doxygen comment syntax to document correct struct member Conflicts: libavcodec/mpeg4video.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14mpeg4video: Fix doxygen comment syntax to document correct struct memberNidhi Makhijani
Also fix some comment typos. Signed-off-by: Diego Biurrun <diego@biurrun.de>
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>
2013-12-08avcodec/mpeg4video: fix 2 more incorrectly associated commentsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'Michael Niedermayer
* commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55': mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'Michael Niedermayer
* commit 'f7d228676cb7669059889c4225c8a8dc56708c24': mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2'Michael Niedermayer
* commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2': mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-05mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContextAnton Khirnov
2013-12-05mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContextAnton Khirnov
2013-12-05mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContextAnton Khirnov
2013-11-30avcodec/mpeg4video: fix doxycomments so they are not associated with random ↵Michael Niedermayer
unrelated fields Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763'Michael Niedermayer
* commit 'e026ee0446de27fc38e33e98704fada012fdc763': mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'Michael Niedermayer
* commit '513d849bb605d3d862da1ada709bd2ca1ac68f58': mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'Michael Niedermayer
* commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091': mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'Michael Niedermayer
* commit '58c120a9290eef057dbf26761a4f89b7f67bbde1': mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'Michael Niedermayer
* commit '6e81597d5a89f64dfab5c7e99e46b4355139e324': mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'Michael Niedermayer
* commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab': mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'Michael Niedermayer
* commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809': mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'Michael Niedermayer
* commit '038890740014dc33d2e2f04da7cf0a9da821264e': mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'Michael Niedermayer
* commit '43af264de8606668c6b2fa7f96c946bdc3dbe072': mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'Michael Niedermayer
* 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>
2013-11-30avcodec/mpeg4videodec: move bug workaround code into seperate functionMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit '48e139409556861c9e561ce34133891d8eecc3cf'Michael Niedermayer
* commit '48e139409556861c9e561ce34133891d8eecc3cf': mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe'Michael Niedermayer
* commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe': mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit '1a89025793ca73d9685a8ce8e3194efa64dd6844'Michael Niedermayer
* commit '1a89025793ca73d9685a8ce8e3194efa64dd6844': mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4'Michael Niedermayer
* commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4': mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72'Michael Niedermayer
* commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72': mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext Conflicts: libavcodec/h263dec.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'Michael Niedermayer
* commit '35e0833d410e31d9fd35695ad798c5d13de2af58': mpeg4videodec: add a mpeg4-specific private context. Conflicts: libavcodec/mpeg4video_parser.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-29mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContextAnton Khirnov
2013-11-29mpeg4videodec: move num_sprite_warping_points from MpegEncContext to ↵Anton Khirnov
Mpeg4DecContext
2013-11-29mpeg4videodec: move sprite_brightness_change from MpegEncContext to ↵Anton Khirnov
Mpeg4DecContext
2013-11-29mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContextAnton Khirnov
2013-11-29mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContextAnton Khirnov
2013-11-29mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContextAnton Khirnov
2013-11-29mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContextAnton Khirnov
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-05 19:26:52 +0300