aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-03-03 16:47:40 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-03-03 16:47:40 +0000
commitd7f5e520bf18cfe0f288bee6c1004b715c32365e (patch)
tree5da898f189cd1530952622cdd401bff492a9a3f8
parent48bf1325acebf118d43216aaadc55808e4d1ed71 (diff)
downloadffmpeg-d7f5e520bf18cfe0f288bee6c1004b715c32365e.tar.gz
move svq3 specific fields to the end of the context
Originally committed as revision 22171 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index f70118f0a7..c0619a1f20 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -355,12 +355,6 @@ typedef struct H264Context{
int emu_edge_width;
int emu_edge_height;
- int halfpel_flag;
- int thirdpel_flag;
-
- int unknown_svq3_flag;
- int next_slice_index;
-
SPS *sps_buffers[MAX_SPS_COUNT];
SPS sps; ///< current sps
@@ -535,8 +529,6 @@ typedef struct H264Context{
int mb_xy;
- uint32_t svq3_watermark_key;
-
/**
* pic_struct in picture timing SEI message
*/
@@ -584,6 +576,13 @@ typedef struct H264Context{
// Timestamp stuff
int sei_buffering_period_present; ///< Buffering period SEI flag
int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs
+
+ //SVQ3 specific fields
+ int halfpel_flag;
+ int thirdpel_flag;
+ int unknown_svq3_flag;
+ int next_slice_index;
+ uint32_t svq3_watermark_key;
}H264Context;