[SCM] libav/experimental: move svq3 specific fields to the end of the context

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d7f5e520bf18cfe0f288bee6c1004b715c32365e
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Mar 3 16:47:40 2010 +0000

    move svq3 specific fields to the end of the context
    
    Originally committed as revision 22171 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index f70118f..c0619a1 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;
 
 

-- 
Libav/FFmpeg packaging