Mercurial > libavcodec.hg
comparison mpegvideo.h @ 9883:ffc0f9de5743 libavcodec
Fix H.264 picture reordering, 2nd try.
First, reverted one was r19239.
Patch by Haruhiko Yamagata, h D yamagata A nifty D com
author | cehoyos |
---|---|
date | Tue, 23 Jun 2009 21:03:35 +0000 |
parents | 5d0f71ba8648 |
children | f86df3ebfef7 |
comparison
equal
deleted
inserted
replaced
9882:7b58b1410f48 | 9883:ffc0f9de5743 |
---|---|
114 #define HAS_CBP(a) ((a)&MB_TYPE_CBP) | 114 #define HAS_CBP(a) ((a)&MB_TYPE_CBP) |
115 | 115 |
116 int field_poc[2]; ///< h264 top/bottom POC | 116 int field_poc[2]; ///< h264 top/bottom POC |
117 int poc; ///< h264 frame POC | 117 int poc; ///< h264 frame POC |
118 int frame_num; ///< h264 frame_num (raw frame_num from slice header) | 118 int frame_num; ///< h264 frame_num (raw frame_num from slice header) |
119 int mmco_reseted; ///< h264 MMCO_RESET set this 1. Reordering code must not mix pictures before and after MMCO_RESET. | |
119 int pic_id; /**< h264 pic_num (short -> no wrap version of pic_num, | 120 int pic_id; /**< h264 pic_num (short -> no wrap version of pic_num, |
120 pic_num & max_pic_num; long -> long_pic_num) */ | 121 pic_num & max_pic_num; long -> long_pic_num) */ |
121 int long_ref; ///< 1->long term reference 0->short term reference | 122 int long_ref; ///< 1->long term reference 0->short term reference |
122 int ref_poc[2][2][16]; ///< h264 POCs of the frames used as reference (FIXME need per slice) | 123 int ref_poc[2][2][16]; ///< h264 POCs of the frames used as reference (FIXME need per slice) |
123 int ref_count[2][2]; ///< number of entries in ref_poc (FIXME need per slice) | 124 int ref_count[2][2]; ///< number of entries in ref_poc (FIXME need per slice) |