diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:21:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:23:43 +0100 |
| commit | ae4e7f7ba603a1624d4aaeee2c368677739b7322 (patch) | |
| tree | 29ea5c72f1e2be65b88f16a5974d7e50851cb594 /libavcodec/mpegvideo.h | |
| parent | b27ba2e540b873fe8e50280a734194ada002a077 (diff) | |
| parent | 58c120a9290eef057dbf26761a4f89b7f67bbde1 (diff) | |
| download | ffmpeg-ae4e7f7ba603a1624d4aaeee2c368677739b7322.tar.gz | |
Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'
* commit '58c120a9290eef057dbf26761a4f89b7f67bbde1':
mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 9225bebb6b..acc047c3fd 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -605,7 +605,6 @@ typedef struct MpegEncContext { int mcsel; int quant_precision; int quarter_sample; ///< 1->qpel, 0->half pel ME/MC - int scalability; int aspect_ratio_info; //FIXME remove int sprite_warping_accuracy; int data_partitioning; ///< data partitioning flag from header |