aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpegvideo.h
Commit message (Collapse)AuthorAgeFilesLines
* lavc/mpegvideo: add missing constLukasz Marek2014-02-081-1/+1
| | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-291-4/+3
|\ | | | | | | | | | | | | | | | | | | * qatar/master: mpeg: Drop unused parameters from ff_draw_horiz_band() Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg: Drop unused parameters from ff_draw_horiz_band()Diego Biurrun2014-01-291-4/+3
| |
* | Merge commit 'ebfe622bb1ca57cecb932e42926745cba7161913'Michael Niedermayer2014-01-091-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ebfe622bb1ca57cecb932e42926745cba7161913': mpegvideo: drop support for real (non-emulated) edges Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_motion.c libavcodec/wmv2.c If this is slower on a major platform then it should be investigated and potentially reverted. See: 8fc52a5ef94712d900fc8fe7503cf9c9ba635143 See: 3969b4b861ce8152e3195e8f8c3437abd273b90a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: drop support for real (non-emulated) edgesAnton Khirnov2014-01-091-1/+1
| | | | | | | | | | | | | | Several decoders disable those anyway and they are not measurably faster on x86. They might be somewhat faster on other platforms due to missing emu edge SIMD, but the gain is not large enough (and those decoders relevant enough) to justify the added complexity.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-041-1/+0
|\| | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo: remove disabled bfin asm Conflicts: libavcodec/bfin/mpegvideo_bfin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: remove disabled bfin asmAnton Khirnov2014-01-031-1/+0
| | | | | | | | It has been disabled as 'broken' over 3 years ago in b716a792
* | Convert XvMC to hwaccel v3Ivan Kalvachev2013-12-221-0/+1
| | | | | | | | | | Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c'Michael Niedermayer2013-12-061-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '24abd806ea0cfb0d988d2f0044eac79cff12918c': ljpegenc: deMpegEncContextize Conflicts: libavcodec/ljpegenc.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c tests/ref/vsynth/vsynth1-ljpeg tests/ref/vsynth/vsynth2-ljpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ljpegenc: deMpegEncContextizeAnton Khirnov2013-12-051-2/+0
| | | | | | | | | | | | | | | | | | The encoder uses almost none of the mpegvideo infrastructure, only some fields from MpegEncContext. The FATE results change because now an all-zero quant matrix is written into the file. Since it is not used for anything for ljpeg, this should not be a problem.
* | Merge commit '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848'Michael Niedermayer2013-12-061-1/+0
|\| | | | | | | | | | | | | * commit '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848': mpegvideo: make ff_release_unused_pictures() static Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: make ff_release_unused_pictures() staticAnton Khirnov2013-12-051-1/+0
| | | | | | | | | | It is only called from one place in mpegvideo.c now. Also remove the remove_current parameter, which is always 1.
* | Merge commit 'c99307caee01441cfde24f3b7b0db3037b7022dc'Michael Niedermayer2013-12-061-1/+0
|\| | | | | | | | | | | | | * commit 'c99307caee01441cfde24f3b7b0db3037b7022dc': mpegvideo: make frame_size_alloc() static. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: make frame_size_alloc() static.Anton Khirnov2013-12-051-1/+0
| | | | | | | | It is not called from outside of mpegvideo.c anymore.
* | Merge commit '0b0a7a751de02464a33717e70352f696372ba1c4'Michael Niedermayer2013-12-061-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit '0b0a7a751de02464a33717e70352f696372ba1c4': mpegvideo: move encode-only parts of common_end() to encode_end() Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move encode-only parts of common_end() to encode_end()Anton Khirnov2013-12-051-0/+1
| |
* | Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'Michael Niedermayer2013-12-061-1/+0
|\| | | | | | | | | | | | | | | | | | | * 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-051-1/+0
| |
* | Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'Michael Niedermayer2013-12-061-1/+0
|\| | | | | | | | | | | | | | | | | | | * 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-051-1/+0
| |
* | Merge commit 'a097f0049b28dc3ed13625e4a42619292c92492f'Michael Niedermayer2013-12-061-1/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'a097f0049b28dc3ed13625e4a42619292c92492f': mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12dec: move first_slice from MpegEncContext to Mpeg1ContextAnton Khirnov2013-12-051-1/+0
| |
* | Merge commit 'ff300e435e5337b03dc7a8f1c0be6c9937059c1e'Michael Niedermayer2013-12-061-1/+0
|\| | | | | | | | | | | | | * commit 'ff300e435e5337b03dc7a8f1c0be6c9937059c1e': mpegvideo: remove an unused variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: remove an unused variableAnton Khirnov2013-12-051-1/+0
| |
* | Merge commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2'Michael Niedermayer2013-12-061-1/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2': mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-12-051-1/+0
| |
* | Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763'Michael Niedermayer2013-11-301-2/+0
|\| | | | | | | | | | | | | * commit 'e026ee0446de27fc38e33e98704fada012fdc763': mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-291-2/+0
| |
* | Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'Michael Niedermayer2013-11-301-1/+0
|\| | | | | | | | | | | | | * commit '513d849bb605d3d862da1ada709bd2ca1ac68f58': mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move num_sprite_warping_points from MpegEncContext to ↵Anton Khirnov2013-11-291-1/+0
| | | | | | | | Mpeg4DecContext
* | Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'Michael Niedermayer2013-11-301-1/+0
|\| | | | | | | | | | | | | * commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091': mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move sprite_brightness_change from MpegEncContext to ↵Anton Khirnov2013-11-291-1/+0
| | | | | | | | Mpeg4DecContext
* | Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'Michael Niedermayer2013-11-301-1/+0
|\| | | | | | | | | | | | | * commit '58c120a9290eef057dbf26761a4f89b7f67bbde1': mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-291-1/+0
| |
* | Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'Michael Niedermayer2013-11-301-1/+0
|\| | | | | | | | | | | | | * commit '6e81597d5a89f64dfab5c7e99e46b4355139e324': mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-291-1/+0
| |
* | Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'Michael Niedermayer2013-11-301-1/+0
|\| | | | | | | | | | | | | * commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5': mpeg4videodec: remove a write-only variable from MpegEncContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: remove a write-only variable from MpegEncContextAnton Khirnov2013-11-291-1/+0
| |
* | Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'Michael Niedermayer2013-11-301-1/+0
|\| | | | | | | | | | | | | * commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab': mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-291-1/+0
| |
* | Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'Michael Niedermayer2013-11-301-1/+0
|\| | | | | | | | | | | | | * commit 'e89247debd5276d57ce4a26516224204f9541af0': mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variableAnton Khirnov2013-11-291-1/+0
| |
* | Merge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07'Michael Niedermayer2013-11-301-1/+0
|\| | | | | | | | | | | | | * commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07': mpeg4videodec: remove a write-only variable from MpegEncContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: remove a write-only variable from MpegEncContextAnton Khirnov2013-11-291-1/+0
| |
* | Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'Michael Niedermayer2013-11-301-1/+0
|\| | | | | | | | | | | | | * commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809': mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-291-1/+0
| |
* | Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'Michael Niedermayer2013-11-301-3/+0
|\| | | | | | | | | | | | | | | | | | | * commit '038890740014dc33d2e2f04da7cf0a9da821264e': mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to ↵Anton Khirnov2013-11-291-3/+0
| | | | | | | | Mpeg4DecContext
* | Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'Michael Niedermayer2013-11-301-7/+0
|\| | | | | | | | | | | | | | | | | | | * commit '43af264de8606668c6b2fa7f96c946bdc3dbe072': mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move mpeg4-specific bug workaround variables from ↵Anton Khirnov2013-11-291-7/+0
| | | | | | | | MpegEncContext to Mpeg4DecContext