Mercurial > libavcodec.hg

changeset 11341:a26f51d0bb63 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move svq3 specific fields to the end of the context
author michael
date Wed, 03 Mar 2010 16:47:40 +0000
parents f5ebc14d90f0
children 8d23ea397dda
files h264.h
diffstat 1 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/h264.h	Wed Mar 03 15:23:22 2010 +0000
+++ b/h264.h	Wed Mar 03 16:47:40 2010 +0000
@@ -355,12 +355,6 @@
     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 @@
 
     int mb_xy;
 
-    uint32_t svq3_watermark_key;
-
     /**
      * pic_struct in picture timing SEI message
      */
@@ -584,6 +576,13 @@
     // 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;