summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4video.h
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7'Michael Niedermayer2014-08-141-6/+6
|\
| * mpeg4video: Fix doxygen comment syntax to document correct struct memberNidhi Makhijani2014-08-141-10/+10
* | Merge commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e'Michael Niedermayer2014-07-291-0/+2
|\ \ | |/
| * mpegvideo: move vol_control_parameters to the only place it is usedNidhi Makhijani2014-07-291-0/+2
* | avcodec/mpeg4video: fix 2 more incorrectly associated commentsMichael Niedermayer2013-12-081-2/+4
* | Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'Michael Niedermayer2013-12-061-0/+2
|\ \ | |/
| * mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-12-051-0/+2
* | Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'Michael Niedermayer2013-12-061-0/+2
|\ \ | |/
| * mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-12-051-0/+2
* | Merge commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2'Michael Niedermayer2013-12-061-0/+1
|\ \ | |/
| * mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-12-051-0/+1
* | avcodec/mpeg4video: fix doxycomments so they are not associated with random u...Michael Niedermayer2013-11-301-5/+5
* | Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763'Michael Niedermayer2013-11-301-0/+4
|\ \ | |/
| * mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-291-0/+4
* | Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'Michael Niedermayer2013-11-301-0/+2
|\ \ | |/
| * mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4Dec...Anton Khirnov2013-11-291-0/+2
* | Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'Michael Niedermayer2013-11-301-0/+1
|\ \ | |/
| * mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecC...Anton Khirnov2013-11-291-0/+1
* | Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'Michael Niedermayer2013-11-301-0/+1
|\ \ | |/
| * mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-291-0/+1
* | Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'Michael Niedermayer2013-11-301-0/+1
|\ \ | |/
| * mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-291-0/+1
* | Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'Michael Niedermayer2013-11-301-0/+2
|\ \ | |/
| * mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-291-0/+2
* | Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'Michael Niedermayer2013-11-301-0/+2
|\ \ | |/
| * mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-291-0/+2
* | Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'Michael Niedermayer2013-11-301-0/+4
|\ \ | |/
| * mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecC...Anton Khirnov2013-11-291-0/+4
* | Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'Michael Niedermayer2013-11-301-0/+6
|\ \ | |/
| * mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncConte...Anton Khirnov2013-11-291-0/+6
* | Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'Michael Niedermayer2013-11-301-0/+1
|\ \ | |/
| * mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpe...Anton Khirnov2013-11-291-0/+1
* | avcodec/mpeg4videodec: move bug workaround code into seperate functionMichael Niedermayer2013-11-301-0/+1
* | Merge commit '48e139409556861c9e561ce34133891d8eecc3cf'Michael Niedermayer2013-11-301-0/+2
|\ \ | |/
| * mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.Anton Khirnov2013-11-291-0/+2
* | Merge commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe'Michael Niedermayer2013-11-291-0/+2
|\ \ | |/
| * mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContextAnton Khirnov2013-11-291-0/+2
* | Merge commit '1a89025793ca73d9685a8ce8e3194efa64dd6844'Michael Niedermayer2013-11-291-1/+2
|\ \ | |/
| * mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContextAnton Khirnov2013-11-291-1/+2
* | Merge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4'Michael Niedermayer2013-11-291-0/+2
|\ \ | |/
| * mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContextAnton Khirnov2013-11-291-0/+2
* | Merge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72'Michael Niedermayer2013-11-291-2/+4
|\ \ | |/
| * mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContextAnton Khirnov2013-11-291-2/+4
* | Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'Michael Niedermayer2013-11-291-0/+4
|\ \ | |/
| * mpeg4videodec: add a mpeg4-specific private context.Anton Khirnov2013-11-291-0/+4
* | Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'Michael Niedermayer2013-11-021-49/+54
|\ \ | |/
| * mpeg4video: K&R formatting cosmeticsVittorio Giovara2013-11-011-49/+54
* | Merge commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14'Michael Niedermayer2013-08-161-0/+3
|\ \ | |/
| * avcodec: Replace local extern declarations for tables with header #includesDiego Biurrun2013-08-151-0/+3
* | Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-231-2/+2
|\ \ | |/