COSMETICS: Remove all trailing whitespace.

Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 183 insertions, 183 deletions

diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 9e02fdca30..da9f0ba3fb 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -22,7 +22,7 @@
  * @file mpegvideo.h
  * mpegvideo header.
  */
- 
+
 #ifndef AVCODEC_MPEGVIDEO_H
 #define AVCODEC_MPEGVIDEO_H
 
@@ -35,7 +35,7 @@ enum OutputFormat {
     FMT_MPEG1,
     FMT_H261,
     FMT_H263,
-    FMT_MJPEG, 
+    FMT_MJPEG,
     FMT_H264,
 };
 
@@ -98,16 +98,16 @@ typedef struct RateControlEntry{
  */
 typedef struct RateControlContext{
     FILE *stats_file;
-    int num_entries;              ///< number of RateControlEntries 
+    int num_entries;              ///< number of RateControlEntries
     RateControlEntry *entry;
-    double buffer_index;          ///< amount of bits in the video/audio buffer 
+    double buffer_index;          ///< amount of bits in the video/audio buffer
     Predictor pred[5];
-    double short_term_qsum;       ///< sum of recent qscales 
-    double short_term_qcount;     ///< count of recent qscales 
-    double pass1_rc_eq_output_sum;///< sum of the output of the rc equation, this is used for normalization  
-    double pass1_wanted_bits;     ///< bits which should have been outputed by the pass1 code (including complexity init) 
+    double short_term_qsum;       ///< sum of recent qscales
+    double short_term_qcount;     ///< count of recent qscales
+    double pass1_rc_eq_output_sum;///< sum of the output of the rc equation, this is used for normalization
+    double pass1_wanted_bits;     ///< bits which should have been outputed by the pass1 code (including complexity init)
     double last_qscale;
-    double last_qscale_for[5];    ///< last qscale for a specific pict type, used for max_diff & ipb factor stuff 
+    double last_qscale_for[5];    ///< last qscale for a specific pict type, used for max_diff & ipb factor stuff
     int last_mc_mb_var_sum;
     int last_mb_var_sum;
     uint64_t i_cplx_sum[5];
@@ -176,11 +176,11 @@ typedef struct Picture{
     int ref_poc[2][16];         ///< h264 POCs of the frames used as reference
     int ref_count[2];           ///< number of entries in ref_poc
 
-    int mb_var_sum;             ///< sum of MB variance for current frame 
-    int mc_mb_var_sum;          ///< motion compensated MB variance for current frame 
-    uint16_t *mb_var;           ///< Table for MB variances 
-    uint16_t *mc_mb_var;        ///< Table for motion compensated MB variances 
-    uint8_t *mb_mean;           ///< Table for MB luminance 
+    int mb_var_sum;             ///< sum of MB variance for current frame
+    int mc_mb_var_sum;          ///< motion compensated MB variance for current frame
+    uint16_t *mb_var;           ///< Table for MB variances
+    uint16_t *mc_mb_var;        ///< Table for motion compensated MB variances
+    uint8_t *mb_mean;           ///< Table for MB luminance
     int32_t *mb_cmp_score;	///< Table for MB cmp scores, for mb decision FIXME remove
     int b_frame_score;          /* */
 } Picture;
@@ -203,17 +203,17 @@ struct MpegEncContext;
  */
 typedef struct MotionEstContext{
     AVCodecContext *avctx;
-    int skip;                          ///< set if ME is skipped for the current MB 
-    int co_located_mv[4][2];           ///< mv from last p frame for direct mode ME 
+    int skip;                          ///< set if ME is skipped for the current MB
+    int co_located_mv[4][2];           ///< mv from last p frame for direct mode ME
     int direct_basis_mv[4][2];
-    uint8_t *scratchpad;               ///< data area for the me algo, so that the ME doesnt need to malloc/free 
+    uint8_t *scratchpad;               ///< data area for the me algo, so that the ME doesnt need to malloc/free
     uint8_t *best_mb;
     uint8_t *temp_mb[2];
     uint8_t *temp;
     int best_bits;
-    uint32_t *map;                     ///< map to avoid duplicate evaluations 
-    uint32_t *score_map;               ///< map to store the scores 
-    int map_generation;  
+    uint32_t *map;                     ///< map to avoid duplicate evaluations
+    uint32_t *score_map;               ///< map to store the scores
+    int map_generation;
     int pre_penalty_factor;
     int penalty_factor;
     int sub_penalty_factor;
@@ -221,7 +221,7 @@ typedef struct MotionEstContext{
     int flags;
     int sub_flags;
     int mb_flags;
-    int pre_pass;                      ///< = 1 for the pre pass 
+    int pre_pass;                      ///< = 1 for the pre pass
     int dia_size;
     int xmin;
     int xmax;
@@ -242,7 +242,7 @@ typedef struct MotionEstContext{
     op_pixels_func (*hpel_avg)[4];
     qpel_mc_func (*qpel_put)[16];
     qpel_mc_func (*qpel_avg)[16];
-    uint8_t (*mv_penalty)[MAX_MV*2+1];  ///< amount of bits needed to encode a MV 
+    uint8_t (*mv_penalty)[MAX_MV*2+1];  ///< amount of bits needed to encode a MV
     uint8_t *current_mv_penalty;
     int (*sub_motion_search)(struct MpegEncContext * s,
 				  int *mx_ptr, int *my_ptr, int dmin,
@@ -256,28 +256,28 @@ typedef struct MotionEstContext{
 typedef struct MpegEncContext {
     struct AVCodecContext *avctx;
     /* the following parameters must be initialized before encoding */
-    int width, height;///< picture size. must be a multiple of 16 
+    int width, height;///< picture size. must be a multiple of 16
     int gop_size;
-    int intra_only;   ///< if true, only intra pictures are generated 
-    int bit_rate;     ///< wanted bit rate 
-    enum OutputFormat out_format; ///< output format 
-    int h263_pred;    ///< use mpeg4/h263 ac/dc predictions 
+    int intra_only;   ///< if true, only intra pictures are generated
+    int bit_rate;     ///< wanted bit rate
+    enum OutputFormat out_format; ///< output format
+    int h263_pred;    ///< use mpeg4/h263 ac/dc predictions
 
 /* the following codec id fields are deprecated in favor of codec_id */
-    int h263_plus;    ///< h263 plus headers 
+    int h263_plus;    ///< h263 plus headers
     int h263_msmpeg4; ///< generate MSMPEG4 compatible stream (deprecated, use msmpeg4_version instead)
-    int h263_flv;     ///< use flv h263 header 
-    
+    int h263_flv;     ///< use flv h263 header
+
     enum CodecID codec_id;     /* see CODEC_ID_xxx */
-    int fixed_qscale; ///< fixed qscale if non zero 
-    int encoding;     ///< true if we are encoding (vs decoding) 
-    int flags;        ///< AVCodecContext.flags (HQ, MV4, ...) 
+    int fixed_qscale; ///< fixed qscale if non zero
+    int encoding;     ///< true if we are encoding (vs decoding)
+    int flags;        ///< AVCodecContext.flags (HQ, MV4, ...)
     int flags2;       ///< AVCodecContext.flags2
-    int max_b_frames; ///< max number of b-frames for encoding 
+    int max_b_frames; ///< max number of b-frames for encoding
     int luma_elim_threshold;
     int chroma_elim_threshold;
-    int strict_std_compliance; ///< strictly follow the std (MPEG4, ...) 
-    int workaround_bugs;       ///< workaround bugs in encoders which cannot be detected automatically 
+    int strict_std_compliance; ///< strictly follow the std (MPEG4, ...)
+    int workaround_bugs;       ///< workaround bugs in encoders which cannot be detected automatically
     /* the following fields are managed internally by the encoder */
 
     /** bit output */
@@ -288,148 +288,148 @@ typedef struct MpegEncContext {
     int input_picture_number;  ///< used to set pic->display_picture_number, shouldnt be used for/by anything else
     int coded_picture_number;  ///< used to set pic->coded_picture_number, shouldnt be used for/by anything else
     int picture_number;       //FIXME remove, unclear definition
-    int picture_in_gop_number; ///< 0-> first pic in gop, ... 
-    int b_frames_since_non_b;  ///< used for encoding, relative to not yet reordered input 
+    int picture_in_gop_number; ///< 0-> first pic in gop, ...
+    int b_frames_since_non_b;  ///< used for encoding, relative to not yet reordered input
     int64_t user_specified_pts;///< last non zero pts from AVFrame which was passed into avcodec_encode_video()
-    int mb_width, mb_height;   ///< number of MBs horizontally & vertically 
+    int mb_width, mb_height;   ///< number of MBs horizontally & vertically
     int mb_stride;             ///< mb_width+1 used for some arrays to allow simple addressing of left & top MBs without sig11
     int b8_stride;             ///< 2*mb_width+1 used for some 8x8 block arrays to allow simple addressing
     int b4_stride;             ///< 4*mb_width+1 used for some 4x4 block arrays to allow simple addressing
     int h_edge_pos, v_edge_pos;///< horizontal / vertical position of the right/bottom edge (pixel replication)
-    int mb_num;                ///< number of MBs of a picture 
-    int linesize;              ///< line size, in bytes, may be different from width 
-    int uvlinesize;            ///< line size, for chroma in bytes, may be different from width 
-    Picture *picture;          ///< main picture buffer 
+    int mb_num;                ///< number of MBs of a picture
+    int linesize;              ///< line size, in bytes, may be different from width
+    int uvlinesize;            ///< line size, for chroma in bytes, may be different from width
+    Picture *picture;          ///< main picture buffer
     Picture **input_picture;   ///< next pictures on display order for encoding
     Picture **reordered_input_picture; ///< pointer to the next pictures in codedorder for encoding
-    
+
     int start_mb_y;            ///< start mb_y of this thread (so current thread should process start_mb_y <= row < end_mb_y)
     int end_mb_y;              ///< end   mb_y of this thread (so current thread should process start_mb_y <= row < end_mb_y)
     struct MpegEncContext *thread_context[MAX_THREADS];
-    
-    /** 
+
+    /**
      * copy of the previous picture structure.
      * note, linesize & data, might not match the previous picture (for field pictures)
      */
-    Picture last_picture;       
-    
-    /** 
+    Picture last_picture;
+
+    /**
      * copy of the next picture structure.
      * note, linesize & data, might not match the next picture (for field pictures)
      */
     Picture next_picture;
-    
-    /** 
+
+    /**
      * copy of the source picture structure for encoding.
      * note, linesize & data, might not match the source picture (for field pictures)
      */
     Picture new_picture;
-    
-    /** 
+
+    /**
      * copy of the current picture structure.
      * note, linesize & data, might not match the current picture (for field pictures)
      */
-    Picture current_picture;    ///< buffer to store the decompressed current picture 
-    
+    Picture current_picture;    ///< buffer to store the decompressed current picture
+
     Picture *last_picture_ptr;     ///< pointer to the previous picture.
-    Picture *next_picture_ptr;     ///< pointer to the next picture (for bidir pred) 
+    Picture *next_picture_ptr;     ///< pointer to the next picture (for bidir pred)
     Picture *current_picture_ptr;  ///< pointer to the current picture
     uint8_t *visualization_buffer[3]; //< temporary buffer vor MV visualization
-    int last_dc[3];                ///< last DC values for MPEG1 
+    int last_dc[3];                ///< last DC values for MPEG1
     int16_t *dc_val_base;
-    int16_t *dc_val[3];            ///< used for mpeg4 DC prediction, all 3 arrays must be continuous 
+    int16_t *dc_val[3];            ///< used for mpeg4 DC prediction, all 3 arrays must be continuous
     int16_t dc_cache[4*5];
     int y_dc_scale, c_dc_scale;
-    const uint8_t *y_dc_scale_table;     ///< qscale -> y_dc_scale table 
-    const uint8_t *c_dc_scale_table;     ///< qscale -> c_dc_scale table 
+    const uint8_t *y_dc_scale_table;     ///< qscale -> y_dc_scale table
+    const uint8_t *c_dc_scale_table;     ///< qscale -> c_dc_scale table
     const uint8_t *chroma_qscale_table;  ///< qscale -> chroma_qscale (h263)
     uint8_t *coded_block_base;
     uint8_t *coded_block;          ///< used for coded block pattern prediction (msmpeg4v3, wmv1)
     int16_t (*ac_val_base)[16];
-    int16_t (*ac_val[3])[16];      ///< used for for mpeg4 AC prediction, all 3 arrays must be continuous 
+    int16_t (*ac_val[3])[16];      ///< used for for mpeg4 AC prediction, all 3 arrays must be continuous
     int ac_pred;
-    uint8_t *prev_pict_types;     ///< previous picture types in bitstream order, used for mb skip 
+    uint8_t *prev_pict_types;     ///< previous picture types in bitstream order, used for mb skip
 #define PREV_PICT_TYPES_BUFFER_SIZE 256
-    int mb_skipped;                ///< MUST BE SET only during DECODING 
-    uint8_t *mbskip_table;        /**< used to avoid copy if macroblock skipped (for black regions for example) 
+    int mb_skipped;                ///< MUST BE SET only during DECODING
+    uint8_t *mbskip_table;        /**< used to avoid copy if macroblock skipped (for black regions for example)
                                    and used for b-frame encoding & decoding (contains skip table of next P Frame) */
-    uint8_t *mbintra_table;       ///< used to avoid setting {ac, dc, cbp}-pred stuff to zero on inter MB decoding 
-    uint8_t *cbp_table;           ///< used to store cbp, ac_pred for partitioned decoding 
-    uint8_t *pred_dir_table;      ///< used to store pred_dir for partitioned decoding 
+    uint8_t *mbintra_table;       ///< used to avoid setting {ac, dc, cbp}-pred stuff to zero on inter MB decoding
+    uint8_t *cbp_table;           ///< used to store cbp, ac_pred for partitioned decoding
+    uint8_t *pred_dir_table;      ///< used to store pred_dir for partitioned decoding
     uint8_t *allocated_edge_emu_buffer;
     uint8_t *edge_emu_buffer;     ///< points into the middle of allocated_edge_emu_buffer
     uint8_t *rd_scratchpad;       ///< scratchpad for rate distortion mb decision
     uint8_t *obmc_scratchpad;
     uint8_t *b_scratchpad;        ///< scratchpad used for writing into write only buffers
 
-    int qscale;                 ///< QP 
-    int chroma_qscale;          ///< chroma QP 
+    int qscale;                 ///< QP
+    int chroma_qscale;          ///< chroma QP
     int lambda;                 ///< lagrange multipler used in rate distortion
-    int lambda2;                ///< (lambda*lambda) >> FF_LAMBDA_SHIFT 
+    int lambda2;                ///< (lambda*lambda) >> FF_LAMBDA_SHIFT
     int *lambda_table;
-    int adaptive_quant;         ///< use adaptive quantization 
-    int dquant;                 ///< qscale difference to prev qscale  
-    int pict_type;              ///< I_TYPE, P_TYPE, B_TYPE, ... 
+    int adaptive_quant;         ///< use adaptive quantization
+    int dquant;                 ///< qscale difference to prev qscale
+    int pict_type;              ///< I_TYPE, P_TYPE, B_TYPE, ...
     int last_pict_type; //FIXME removes
-    int last_non_b_pict_type;   ///< used for mpeg4 gmc b-frames & ratecontrol 
+    int last_non_b_pict_type;   ///< used for mpeg4 gmc b-frames & ratecontrol
     int dropable;
     int frame_rate_index;
 
     /* motion compensation */
-    int unrestricted_mv;        ///< mv can point outside of the coded picture 
-    int h263_long_vectors;      ///< use horrible h263v1 long vector mode 
+    int unrestricted_mv;        ///< mv can point outside of the coded picture
+    int h263_long_vectors;      ///< use horrible h263v1 long vector mode
     int decode;                 ///< if 0 then decoding will be skipped (for encoding b frames for example)
 
     DSPContext dsp;             ///< pointers for accelerated dsp functions
-    int f_code;                 ///< forward MV resolution 
-    int b_code;                 ///< backward MV resolution for B Frames (mpeg4) 
+    int f_code;                 ///< forward MV resolution
+    int b_code;                 ///< backward MV resolution for B Frames (mpeg4)
     int16_t (*p_mv_table_base)[2];
     int16_t (*b_forw_mv_table_base)[2];
     int16_t (*b_back_mv_table_base)[2];
-    int16_t (*b_bidir_forw_mv_table_base)[2]; 
-    int16_t (*b_bidir_back_mv_table_base)[2]; 
+    int16_t (*b_bidir_forw_mv_table_base)[2];
+    int16_t (*b_bidir_back_mv_table_base)[2];
     int16_t (*b_direct_mv_table_base)[2];
     int16_t (*p_field_mv_table_base[2][2])[2];
     int16_t (*b_field_mv_table_base[2][2][2])[2];
-    int16_t (*p_mv_table)[2];            ///< MV table (1MV per MB) p-frame encoding 
-    int16_t (*b_forw_mv_table)[2];       ///< MV table (1MV per MB) forward mode b-frame encoding 
-    int16_t (*b_back_mv_table)[2];       ///< MV table (1MV per MB) backward mode b-frame encoding 
-    int16_t (*b_bidir_forw_mv_table)[2]; ///< MV table (1MV per MB) bidir mode b-frame encoding 
-    int16_t (*b_bidir_back_mv_table)[2]; ///< MV table (1MV per MB) bidir mode b-frame encoding 
-    int16_t (*b_direct_mv_table)[2];     ///< MV table (1MV per MB) direct mode b-frame encoding 
+    int16_t (*p_mv_table)[2];            ///< MV table (1MV per MB) p-frame encoding
+    int16_t (*b_forw_mv_table)[2];       ///< MV table (1MV per MB) forward mode b-frame encoding
+    int16_t (*b_back_mv_table)[2];       ///< MV table (1MV per MB) backward mode b-frame encoding
+    int16_t (*b_bidir_forw_mv_table)[2]; ///< MV table (1MV per MB) bidir mode b-frame encoding
+    int16_t (*b_bidir_back_mv_table)[2]; ///< MV table (1MV per MB) bidir mode b-frame encoding
+    int16_t (*b_direct_mv_table)[2];     ///< MV table (1MV per MB) direct mode b-frame encoding
     int16_t (*p_field_mv_table[2][2])[2];   ///< MV table (2MV per MB) interlaced p-frame encoding
     int16_t (*b_field_mv_table[2][2][2])[2];///< MV table (4MV per MB) interlaced b-frame encoding
     uint8_t (*p_field_select_table[2]);
     uint8_t (*b_field_select_table[2][2]);
-    int me_method;                       ///< ME algorithm 
+    int me_method;                       ///< ME algorithm
     int mv_dir;
 #define MV_DIR_BACKWARD  1
 #define MV_DIR_FORWARD   2
 #define MV_DIRECT        4 ///< bidirectional mode where the difference equals the MV of the last P/S/I-Frame (mpeg4)
     int mv_type;
-#define MV_TYPE_16X16       0   ///< 1 vector for the whole mb 
-#define MV_TYPE_8X8         1   ///< 4 vectors (h263, mpeg4 4MV) 
-#define MV_TYPE_16X8        2   ///< 2 vectors, one per 16x8 block  
-#define MV_TYPE_FIELD       3   ///< 2 vectors, one per field  
-#define MV_TYPE_DMV         4   ///< 2 vectors, special mpeg2 Dual Prime Vectors 
-    /**motion vectors for a macroblock 
+#define MV_TYPE_16X16       0   ///< 1 vector for the whole mb
+#define MV_TYPE_8X8         1   ///< 4 vectors (h263, mpeg4 4MV)
+#define MV_TYPE_16X8        2   ///< 2 vectors, one per 16x8 block
+#define MV_TYPE_FIELD       3   ///< 2 vectors, one per field
+#define MV_TYPE_DMV         4   ///< 2 vectors, special mpeg2 Dual Prime Vectors
+    /**motion vectors for a macroblock
        first coordinate : 0 = forward 1 = backward
        second "         : depend on type
        third  "         : 0 = x, 1 = y
     */
     int mv[2][4][2];
     int field_select[2][2];
-    int last_mv[2][2][2];             ///< last MV, used for MV prediction in MPEG1 & B-frame MPEG4 
-    uint8_t *fcode_tab;               ///< smallest fcode needed for each MV 
-    
+    int last_mv[2][2][2];             ///< last MV, used for MV prediction in MPEG1 & B-frame MPEG4
+    uint8_t *fcode_tab;               ///< smallest fcode needed for each MV
+
     MotionEstContext me;
 
-    int no_rounding;  /**< apply no rounding to motion compensation (MPEG4, msmpeg4, ...) 
+    int no_rounding;  /**< apply no rounding to motion compensation (MPEG4, msmpeg4, ...)
                         for b-frames rounding mode is allways 0 */
 
     int hurry_up;     /**< when set to 1 during decoding, b frames will be skipped
                          when set to 2 idct/dequant will be skipped too */
-                        
+
     /* macroblock layer */
     int mb_x, mb_y;
     int mb_skip_run;
@@ -454,7 +454,7 @@ typedef struct MpegEncContext {
     int block_index[6]; ///< index to current MB in block based arrays with edges
     int block_wrap[6];
     uint8_t *dest[3];
-    
+
     int *mb_index2xy;        ///< mb_index -> mb_x + mb_y*mb_stride
 
     /** matrix transmitted in the bitstream */
@@ -463,11 +463,11 @@ typedef struct MpegEncContext {
     uint16_t inter_matrix[64];
     uint16_t chroma_inter_matrix[64];
 #define QUANT_BIAS_SHIFT 8
-    int intra_quant_bias;    ///< bias for the quantizer 
-    int inter_quant_bias;    ///< bias for the quantizer 
-    int min_qcoeff;          ///< minimum encodable coefficient 
-    int max_qcoeff;          ///< maximum encodable coefficient 
-    int ac_esc_length;       ///< num of bits needed to encode the longest esc 
+    int intra_quant_bias;    ///< bias for the quantizer
+    int inter_quant_bias;    ///< bias for the quantizer
+    int min_qcoeff;          ///< minimum encodable coefficient
+    int max_qcoeff;          ///< maximum encodable coefficient
+    int ac_esc_length;       ///< num of bits needed to encode the longest esc
     uint8_t *intra_ac_vlc_length;
     uint8_t *intra_ac_vlc_last_length;
     uint8_t *inter_ac_vlc_length;
@@ -490,7 +490,7 @@ typedef struct MpegEncContext {
     ScanTable intra_h_scantable;
     ScanTable intra_v_scantable;
     ScanTable inter_scantable; ///< if inter == intra then intra should be used to reduce tha cache usage
-    
+
     /* noise reduction */
     int (*dct_error_sum)[64];
     int dct_count[2];
@@ -501,7 +501,7 @@ typedef struct MpegEncContext {
     /* bit rate control */
     int64_t wanted_bits;
     int64_t total_bits;
-    int frame_bits;                ///< bits used for the current frame 
+    int frame_bits;                ///< bits used for the current frame
     RateControlContext rc_context; ///< contains stuff only accessed in ratecontrol.c
 
     /* statistics, used for 2-pass encoding */
@@ -515,11 +515,11 @@ typedef struct MpegEncContext {
     int skip_count;
     int misc_bits; ///< cbp, mb_type
     int last_bits; ///< temp var used for calculating the above vars
-    
+
     /* error concealment / resync */
     int error_count;
-    uint8_t *error_status_table;       ///< table of the error status of each MB  
-#define VP_START            1          ///< current MB is the first after a resync marker 
+    uint8_t *error_status_table;       ///< table of the error status of each MB
+#define VP_START            1          ///< current MB is the first after a resync marker
 #define AC_ERROR            2
 #define DC_ERROR            4
 #define MV_ERROR            8
@@ -527,40 +527,40 @@ typedef struct MpegEncContext {
 #define DC_END              32
 #define MV_END              64
 //FIXME some prefix?
-    
-    int resync_mb_x;                 ///< x position of last resync marker 
-    int resync_mb_y;                 ///< y position of last resync marker 
-    GetBitContext last_resync_gb;    ///< used to search for the next resync marker 
+
+    int resync_mb_x;                 ///< x position of last resync marker
+    int resync_mb_y;                 ///< y position of last resync marker
+    GetBitContext last_resync_gb;    ///< used to search for the next resync marker
     int mb_num_left;                 ///< number of MBs left in this video packet (for partitioned Slices only)
-    int next_p_frame_damaged;        ///< set if the next p frame is damaged, to avoid showing trashed b frames 
+    int next_p_frame_damaged;        ///< set if the next p frame is damaged, to avoid showing trashed b frames
     int error_resilience;
-    
+
     ParseContext parse_context;
 
     /* H.263 specific */
     int gob_index;
     int obmc;                       ///< overlapped block motion compensation
-        
+
     /* H.263+ specific */
-    int umvplus;                    ///< == H263+ && unrestricted_mv 
-    int h263_aic;                   ///< Advanded INTRA Coding (AIC) 
+    int umvplus;                    ///< == H263+ && unrestricted_mv
+    int h263_aic;                   ///< Advanded INTRA Coding (AIC)
     int h263_aic_dir;               ///< AIC direction: 0 = left, 1 = top
     int h263_slice_structured;
     int alt_inter_vlc;              ///< alternative inter vlc
     int modified_quant;
-    int loop_filter;    
+    int loop_filter;
     int custom_pcf;
-    
+
     /* mpeg4 specific */
-    int time_increment_bits;        ///< number of bits to represent the fractional part of time 
+    int time_increment_bits;        ///< number of bits to represent the fractional part of time
     int last_time_base;
-    int time_base;                  ///< time in seconds of last I,P,S Frame 
-    int64_t time;                   ///< time of current frame  
+    int time_base;                  ///< time in seconds of last I,P,S Frame
+    int64_t time;                   ///< time of current frame
     int64_t last_non_b_time;
-    uint16_t pp_time;               ///< time distance between the last 2 p,s,i frames 
-    uint16_t pb_time;               ///< time distance between the last b and p,s,i frame 
+    uint16_t pp_time;               ///< time distance between the last 2 p,s,i frames
+    uint16_t pb_time;               ///< time distance between the last b and p,s,i frame
     uint16_t pp_field_time;
-    uint16_t pb_field_time;         ///< like above, just for interlaced 
+    uint16_t pb_field_time;         ///< like above, just for interlaced
     int shape;
     int vol_sprite_usage;
     int sprite_width;
@@ -570,12 +570,12 @@ typedef struct MpegEncContext {
     int sprite_brightness_change;
     int num_sprite_warping_points;
     int real_sprite_warping_points;
-    int sprite_offset[2][2];         ///< sprite offset[isChroma][isMVY] 
-    int sprite_delta[2][2];          ///< sprite_delta [isY][isMVY]  
-    int sprite_shift[2];             ///< sprite shift [isChroma] 
+    int sprite_offset[2][2];         ///< sprite offset[isChroma][isMVY]
+    int sprite_delta[2][2];          ///< sprite_delta [isY][isMVY]
+    int sprite_shift[2];             ///< sprite shift [isChroma]
     int mcsel;
     int quant_precision;
-    int quarter_sample;              ///< 1->qpel, 0->half pel ME/MC  
+    int quarter_sample;              ///< 1->qpel, 0->half pel ME/MC
     int scalability;
     int hierachy_type;
     int enhancement_type;
@@ -584,19 +584,19 @@ typedef struct MpegEncContext {
     int aspect_ratio_info; //FIXME remove
     int sprite_warping_accuracy;
     int low_latency_sprite;
-    int data_partitioning;           ///< data partitioning flag from header 
-    int partitioned_frame;           ///< is current frame partitioned 
-    int rvlc;                        ///< reversible vlc 
+    int data_partitioning;           ///< data partitioning flag from header
+    int partitioned_frame;           ///< is current frame partitioned
+    int rvlc;                        ///< reversible vlc
     int resync_marker;               ///< could this stream contain resync markers
-    int low_delay;                   ///< no reordering needed / has no b-frames 
+    int low_delay;                   ///< no reordering needed / has no b-frames
     int vo_type;
-    int vol_control_parameters;      ///< does the stream contain the low_delay flag, used to workaround buggy encoders 
-    int intra_dc_threshold;          ///< QP above whch the ac VLC should be used for intra dc 
-    PutBitContext tex_pb;            ///< used for data partitioned VOPs 
-    PutBitContext pb2;               ///< used for data partitioned VOPs 
+    int vol_control_parameters;      ///< does the stream contain the low_delay flag, used to workaround buggy encoders
+    int intra_dc_threshold;          ///< QP above whch the ac VLC should be used for intra dc
+    PutBitContext tex_pb;            ///< used for data partitioned VOPs
+    PutBitContext pb2;               ///< used for data partitioned VOPs
     int mpeg_quant;
-    int t_frame;                       ///< time distance of first I -> B, used for interlaced b frames 
-    int padding_bug_score;             ///< used to detect the VERY common padding bug in MPEG4 
+    int t_frame;                       ///< time distance of first I -> B, used for interlaced b frames
+    int padding_bug_score;             ///< used to detect the VERY common padding bug in MPEG4
 
     /* divx specific, used to workaround (many) bugs in divx5 */
     int divx_version;
@@ -605,22 +605,22 @@ typedef struct MpegEncContext {
     uint8_t *bitstream_buffer; //Divx 5.01 puts several frames in a single one, this is used to reorder them
     int bitstream_buffer_size;
     int allocated_bitstream_buffer_size;
-    
+
     int xvid_build;
-    
+
     /* lavc specific stuff, used to workaround bugs in libavcodec */
     int lavc_build;
-    
+
     /* RV10 specific */
-    int rv10_version; ///< RV10 version: 0 or 3 
+    int rv10_version; ///< RV10 version: 0 or 3
     int rv10_first_dc_coded[3];
-    
+
     /* MJPEG specific */
     struct MJpegContext *mjpeg_ctx;
-    int mjpeg_vsample[3];       ///< vertical sampling factors, default = {2, 1, 1} 
-    int mjpeg_hsample[3];       ///< horizontal sampling factors, default = {2, 1, 1} 
-    int mjpeg_write_tables;     ///< do we want to have quantisation- and huffmantables in the jpeg file ? 
-    int mjpeg_data_only_frames; ///< frames only with SOI, SOS and EOI markers 
+    int mjpeg_vsample[3];       ///< vertical sampling factors, default = {2, 1, 1}
+    int mjpeg_hsample[3];       ///< horizontal sampling factors, default = {2, 1, 1}
+    int mjpeg_write_tables;     ///< do we want to have quantisation- and huffmantables in the jpeg file ?
+    int mjpeg_data_only_frames; ///< frames only with SOI, SOS and EOI markers
 
     /* MSMPEG4 specific */
     int mv_table_index;
@@ -628,8 +628,8 @@ typedef struct MpegEncContext {
     int rl_chroma_table_index;
     int dc_table_index;
     int use_skip_mb_code;
-    int slice_height;      ///< in macroblocks 
-    int first_slice_line;  ///< used in mpeg4 too to handle resync markers 
+    int slice_height;      ///< in macroblocks
+    int first_slice_line;  ///< used in mpeg4 too to handle resync markers
     int flipflop_rounding;
     int msmpeg4_version;   ///< 0=not msmpeg4, 1=mp41, 2=mp42, 3=mp43/divx3 4=wmv1/7 5=wmv2/8
     int per_mb_rl_table;
@@ -644,11 +644,11 @@ typedef struct MpegEncContext {
     GetBitContext gb;
 
     /* Mpeg1 specific */
-    int gop_picture_number;  ///< index of the first picture of a GOP based on fake_pic_num & mpeg1 specific 
-    int last_mv_dir;         ///< last mv_dir, used for b frame encoding 
+    int gop_picture_number;  ///< index of the first picture of a GOP based on fake_pic_num & mpeg1 specific
+    int last_mv_dir;         ///< last mv_dir, used for b frame encoding
     int broken_link;         ///< no_output_of_prior_pics_flag
-    uint8_t *vbv_delay_ptr;  ///< pointer to vbv_delay in the bitstream 
-    
+    uint8_t *vbv_delay_ptr;  ///< pointer to vbv_delay in the bitstream
+
     /* MPEG2 specific - I wish I had not to support this mess. */
     int progressive_sequence;
     int mpeg_f_code[2][2];
@@ -682,34 +682,34 @@ typedef struct MpegEncContext {
 
     /* RTP specific */
     int rtp_mode;
-    
+
     uint8_t *ptr_lastgob;
     int swap_uv;//vcr2 codec is mpeg2 varint with UV swaped
     short * pblocks[12];
-    
-    DCTELEM (*block)[64]; ///< points to one of the following blocks 
+
+    DCTELEM (*block)[64]; ///< points to one of the following blocks
     DCTELEM (*blocks)[6][64]; // for HQ mode we need to keep the best block
     int (*decode_mb)(struct MpegEncContext *s, DCTELEM block[6][64]); // used by some codecs to avoid a switch()
 #define SLICE_OK         0
 #define SLICE_ERROR     -1
 #define SLICE_END       -2 ///<end marker found
 #define SLICE_NOEND     -3 ///<no end marker or error found but mb count exceeded
-    
-    void (*dct_unquantize_mpeg1_intra)(struct MpegEncContext *s, 
+
+    void (*dct_unquantize_mpeg1_intra)(struct MpegEncContext *s,
                            DCTELEM *block/*align 16*/, int n, int qscale);
-    void (*dct_unquantize_mpeg1_inter)(struct MpegEncContext *s, 
+    void (*dct_unquantize_mpeg1_inter)(struct MpegEncContext *s,
                            DCTELEM *block/*align 16*/, int n, int qscale);
-    void (*dct_unquantize_mpeg2_intra)(struct MpegEncContext *s, 
+    void (*dct_unquantize_mpeg2_intra)(struct MpegEncContext *s,
                            DCTELEM *block/*align 16*/, int n, int qscale);
-    void (*dct_unquantize_mpeg2_inter)(struct MpegEncContext *s, 
+    void (*dct_unquantize_mpeg2_inter)(struct MpegEncContext *s,
                            DCTELEM *block/*align 16*/, int n, int qscale);
-    void (*dct_unquantize_h263_intra)(struct MpegEncContext *s, 
+    void (*dct_unquantize_h263_intra)(struct MpegEncContext *s,
                            DCTELEM *block/*align 16*/, int n, int qscale);
-    void (*dct_unquantize_h263_inter)(struct MpegEncContext *s, 
+    void (*dct_unquantize_h263_inter)(struct MpegEncContext *s,
                            DCTELEM *block/*align 16*/, int n, int qscale);
-    void (*dct_unquantize_h261_intra)(struct MpegEncContext *s, 
+    void (*dct_unquantize_h261_intra)(struct MpegEncContext *s,
                            DCTELEM *block/*align 16*/, int n, int qscale);
-    void (*dct_unquantize_h261_inter)(struct MpegEncContext *s, 
+    void (*dct_unquantize_h261_inter)(struct MpegEncContext *s,
                            DCTELEM *block/*align 16*/, int n, int qscale);
     void (*dct_unquantize_intra)(struct MpegEncContext *s, // unquantizer to use (mpeg4 can use both)
                            DCTELEM *block/*align 16*/, int n, int qscale);
@@ -754,7 +754,7 @@ void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length);
 void ff_clean_intra_table_entries(MpegEncContext *s);
 void ff_init_scantable(uint8_t *, ScanTable *st, const uint8_t *src_scantable);
 void ff_draw_horiz_band(MpegEncContext *s, int y, int h);
-void ff_emulated_edge_mc(uint8_t *buf, uint8_t *src, int linesize, int block_w, int block_h, 
+void ff_emulated_edge_mc(uint8_t *buf, uint8_t *src, int linesize, int block_w, int block_h,
                                     int src_x, int src_y, int w, int h);
 #define END_NOT_FOUND -100
 int ff_combine_frame(ParseContext *pc, int next, uint8_t **buf, int *buf_size);
@@ -810,8 +810,8 @@ void ff_fix_long_mvs(MpegEncContext * s, uint8_t *field_select_table, int field_
 void ff_init_me(MpegEncContext *s);
 int ff_pre_estimate_p_frame_motion(MpegEncContext * s, int mb_x, int mb_y);
 inline int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr,
-                             int P[10][2], int src_index, int ref_index, int16_t (*last_mv)[2], 
-                             int ref_mv_scale, int size, int h);                             
+                             int P[10][2], int src_index, int ref_index, int16_t (*last_mv)[2],
+                             int ref_mv_scale, int size, int h);
 int inline ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index,
                                int ref_index, int size, int h, int add_rate);
 
@@ -832,16 +832,16 @@ int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
 
 /** RLTable. */
 typedef struct RLTable {
-    int n;                         ///< number of entries of table_vlc minus 1 
-    int last;                      ///< number of values for last = 0 
+    int n;                         ///< number of entries of table_vlc minus 1
+    int last;                      ///< number of values for last = 0
     const uint16_t (*table_vlc)[2];
     const int8_t *table_run;
     const int8_t *table_level;
-    uint8_t *index_run[2];         ///< encoding only 
-    int8_t *max_level[2];          ///< encoding & decoding 
-    int8_t *max_run[2];            ///< encoding & decoding 
+    uint8_t *index_run[2];         ///< encoding only
+    int8_t *max_level[2];          ///< encoding & decoding
+    int8_t *max_run[2];            ///< encoding & decoding
     VLC vlc;                       ///< decoding only deprected FIXME remove
-    RL_VLC_ELEM *rl_vlc[32];       ///< decoding only 
+    RL_VLC_ELEM *rl_vlc[32];       ///< decoding only
 } RLTable;
 
 void init_rl(RLTable *rl, int use_static);
@@ -878,14 +878,14 @@ void ff_h261_encode_init(MpegEncContext *s);
 
 /* h263.c, h263dec.c */
 int ff_h263_decode_init(AVCodecContext *avctx);
-int ff_h263_decode_frame(AVCodecContext *avctx, 
+int ff_h263_decode_frame(AVCodecContext *avctx,
                              void *data, int *data_size,
                              uint8_t *buf, int buf_size);
 int ff_h263_decode_end(AVCodecContext *avctx);
-void h263_encode_mb(MpegEncContext *s, 
+void h263_encode_mb(MpegEncContext *s,
                     DCTELEM block[6][64],
                     int motion_x, int motion_y);
-void mpeg4_encode_mb(MpegEncContext *s, 
+void mpeg4_encode_mb(MpegEncContext *s,
                     DCTELEM block[6][64],
                     int motion_x, int motion_y);
 void h263_encode_picture_header(MpegEncContext *s, int picture_number);
@@ -893,7 +893,7 @@ void ff_flv_encode_picture_header(MpegEncContext *s, int picture_number);
 void h263_encode_gob_header(MpegEncContext * s, int mb_line);
 int16_t *h263_pred_motion(MpegEncContext * s, int block, int dir,
                         int *px, int *py);
-void mpeg4_pred_ac(MpegEncContext * s, DCTELEM *block, int n, 
+void mpeg4_pred_ac(MpegEncContext * s, DCTELEM *block, int n,
                    int dir);
 void ff_set_mpeg4_time(MpegEncContext * s, int picture_number);
 void mpeg4_encode_picture_header(MpegEncContext *s, int picture_number);
@@ -941,7 +941,7 @@ void rv20_encode_picture_header(MpegEncContext *s, int picture_number);
 /* msmpeg4.c */
 void msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number);
 void msmpeg4_encode_ext_header(MpegEncContext * s);
-void msmpeg4_encode_mb(MpegEncContext * s, 
+void msmpeg4_encode_mb(MpegEncContext * s,
                        DCTELEM block[6][64],
                        int motion_x, int motion_y);
 int msmpeg4_decode_picture_header(MpegEncContext * s);
@@ -956,14 +956,14 @@ void ff_mspel_motion(MpegEncContext *s,
                                uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
                                int motion_x, int motion_y, int h);
 int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number);
-void ff_wmv2_encode_mb(MpegEncContext * s, 
+void ff_wmv2_encode_mb(MpegEncContext * s,
                        DCTELEM block[6][64],
                        int motion_x, int motion_y);
 
 /* mjpeg.c */
 int mjpeg_init(MpegEncContext *s);
 void mjpeg_close(MpegEncContext *s);
-void mjpeg_encode_mb(MpegEncContext *s, 
+void mjpeg_encode_mb(MpegEncContext *s,
                      DCTELEM block[6][64]);
 void mjpeg_picture_header(MpegEncContext *s);
 void mjpeg_picture_trailer(MpegEncContext *s);