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
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
2013-11-29mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to ↵Anton Khirnov
Mpeg4DecContext
2013-11-29mpeg4videodec: move mpeg4-specific bug workaround variables from ↵Anton Khirnov
MpegEncContext to Mpeg4DecContext
2013-11-29mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to ↵Anton Khirnov
mpeg4videodec
2013-11-29mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.Anton Khirnov
2013-11-29mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContextAnton Khirnov
2013-11-29mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContextAnton Khirnov
2013-11-29mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContextAnton Khirnov
The field remains in MpegEncContext for use in the encoder.
2013-11-29mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContextAnton Khirnov
2013-11-29mpeg4videodec: add a mpeg4-specific private context.Anton Khirnov
2013-11-02Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'Michael Niedermayer
* commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0': mpeg4video: K&R formatting cosmetics Conflicts: libavcodec/mpeg4video.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02mpeg4video: K&R formatting cosmeticsVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-08-16Merge commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14'Michael Niedermayer
* commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14': avcodec: Replace local extern declarations for tables with header #includes Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-15avcodec: Replace local extern declarations for tables with header #includesDiego Biurrun
2013-01-23Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23Drop DCTELEM typedefDiego Biurrun
It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-11-17ff_mpeg4videodec_static_init: fix return typeMichael Niedermayer
Fixes CID743439 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13mpeg4videodec: split static decoder table init outMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (27 commits) ppc: Add ff_ prefix to nonstatic symbols sh4: Add ff_ prefix to nonstatic symbols mpegvideo: Add ff_ prefix to nonstatic functions rtjpeg: Add ff_ prefix to nonstatic symbols rv: Add ff_ prefix to nonstatic symbols vp56: Add ff_ prefix to nonstatic symbols vorbis: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefix to nonstatic symbols vc1: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefixes to nonstatic symbols snow: Add ff_ prefix to nonstatic symbols mpeg12: Add ff_ prefix to nonstatic symbols mpeg4: Add ff_ prefixes to nonstatic symbols lagarith: Add ff_ prefix to lag_rac_init libavcodec: Add ff_ prefix to j_rev_dct* dsputil: Add ff_ prefix to inv_zigzag_direct16 libavcodec: Prefix fdct_ifast, fdct_ifast248 dsputil: Add ff_ prefix to the dsputil*_init* functions libavcodec: Add ff_ prefix to some nonstatic symbols vlc/rl: Add ff_ prefix to the nonstatic symbols ... Conflicts: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h263.h libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/nuv.c libavcodec/ppc/dsputil_ppc.c libavcodec/proresdsp.c libavcodec/svq3.c libavcodec/version.h libavformat/dv.h libavformat/dvenc.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-05 10:21:26 +0300