diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:31:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:31:28 +0100 |
| commit | dc226c023d2b55d9e94b6b0b07b7c76ad6f0b16a (patch) | |
| tree | 2baeda6ba5ec200676ff341042daff87dd673f11 /libavcodec | |
| parent | 329a3286d648414b672a983427e5c7d38589f7f9 (diff) | |
| parent | 7245a0ae872d4f65396a37d13f5d1d2c2efe11c2 (diff) | |
| download | ffmpeg-dc226c023d2b55d9e94b6b0b07b7c76ad6f0b16a.tar.gz | |
Merge commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2'
* commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2':
mpegvideo: remove h264-only fields
Conflicts:
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index cad775d76a..4694b1a2e6 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -313,7 +313,7 @@ typedef struct H264Picture { int pic_id; /**< pic_num (short -> no wrap version of pic_num, pic_num & max_pic_num; long -> long_pic_num) */ int long_ref; ///< 1->long term reference 0->short term reference - int ref_poc[2][2][32]; ///< POCs of the frames used as reference (FIXME need per slice) + int ref_poc[2][2][32]; ///< POCs of the frames/fields used as reference (FIXME need per slice) int ref_count[2][2]; ///< number of entries in ref_poc (FIXME need per slice) int mbaff; ///< 1 -> MBAFF frame 0-> not MBAFF int field_picture; ///< whether or not picture was encoded in separate fields diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 79ee2b20fd..ef5092e7fb 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -128,16 +128,6 @@ typedef struct Picture{ */ void *hwaccel_picture_private; - int field_poc[2]; ///< h264 top/bottom POC - int poc; ///< h264 frame POC - int frame_num; ///< h264 frame_num (raw frame_num from slice header) - int mmco_reset; ///< h264 MMCO_RESET set this 1. Reordering code must not mix pictures before and after MMCO_RESET. - int pic_id; /**< h264 pic_num (short -> no wrap version of pic_num, - pic_num & max_pic_num; long -> long_pic_num) */ - int long_ref; ///< 1->long term reference 0->short term reference - int ref_poc[2][2][32]; ///< h264 POCs of the frames/fields used as reference (FIXME need per slice) - int ref_count[2][2]; ///< number of entries in ref_poc (FIXME need per slice) - int mbaff; ///< h264 1 -> MBAFF frame 0-> not MBAFF int field_picture; ///< whether or not the picture was encoded in separate fields int mb_var_sum; ///< sum of MB variance for current frame @@ -148,7 +138,6 @@ typedef struct Picture{ int reference; int shared; - int recovered; ///< Picture at IDR or recovery point + recovery count } Picture; /** |