COSMETICS: Remove all trailing whitespace.

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

1 files changed, 76 insertions, 76 deletions

diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c
index 75e924cb67..4708454190 100644
--- a/libavcodec/wmv2.c
+++ b/libavcodec/wmv2.c
@@ -21,9 +21,9 @@
  * @file wmv2.c
  * wmv2 codec.
  */
- 
+
 #include "simple_idct.h"
- 
+
 #define SKIP_TYPE_NONE 0
 #define SKIP_TYPE_MPEG 1
 #define SKIP_TYPE_ROW  2
@@ -47,14 +47,14 @@ typedef struct Wmv2Context{
     int per_mb_rl_bit;
     int skip_type;
     int hshift;
-    
+
     ScanTable abt_scantable[2];
     DCTELEM abt_block2[6][64] __align8;
 }Wmv2Context;
 
 static void wmv2_common_init(Wmv2Context * w){
     MpegEncContext * const s= &w->s;
-        
+
     ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0], wmv2_scantableA);
     ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[1], wmv2_scantableB);
 }
@@ -65,12 +65,12 @@ static int encode_ext_header(Wmv2Context *w){
     MpegEncContext * const s= &w->s;
     PutBitContext pb;
     int code;
-        
+
     init_put_bits(&pb, s->avctx->extradata, s->avctx->extradata_size);
 
     put_bits(&pb, 5, s->avctx->time_base.den / s->avctx->time_base.num); //yes 29.97 -> 29
     put_bits(&pb, 11, FFMIN(s->bit_rate/1024, 2047));
-    
+
     put_bits(&pb, 1, w->mspel_bit=1);
     put_bits(&pb, 1, w->flag3=1);
     put_bits(&pb, 1, w->abt_flag=1);
@@ -78,38 +78,38 @@ static int encode_ext_header(Wmv2Context *w){
     put_bits(&pb, 1, w->top_left_mv_flag=0);
     put_bits(&pb, 1, w->per_mb_rl_bit=1);
     put_bits(&pb, 3, code=1);
-    
+
     flush_put_bits(&pb);
 
     s->slice_height = s->mb_height / code;
-    
+
     return 0;
 }
 
 static int wmv2_encode_init(AVCodecContext *avctx){
     Wmv2Context * const w= avctx->priv_data;
-    
+
     if(MPV_encode_init(avctx) < 0)
         return -1;
-    
+
     wmv2_common_init(w);
 
     avctx->extradata_size= 4;
     avctx->extradata= av_mallocz(avctx->extradata_size + 10);
     encode_ext_header(w);
-    
+
     return 0;
 }
 
 #if 0 /* unused, remove? */
 static int wmv2_encode_end(AVCodecContext *avctx){
-    
+
     if(MPV_encode_end(avctx) < 0)
         return -1;
-    
+
     avctx->extradata_size= 0;
     av_freep(&avctx->extradata);
-    
+
     return 0;
 }
 #endif
@@ -138,9 +138,9 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
     if (s->pict_type == I_TYPE) {
         assert(s->no_rounding==1);
         if(w->j_type_bit) put_bits(&s->pb, 1, w->j_type);
-        
+
         if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table);
-        
+
         if(!s->per_mb_rl_table){
             code012(&s->pb, s->rl_chroma_table_index);
             code012(&s->pb, s->rl_table_index);
@@ -153,7 +153,7 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
         int cbp_index;
 
         put_bits(&s->pb, 2, SKIP_TYPE_NONE);
-        
+
         code012(&s->pb, cbp_index=0);
         if(s->qscale <= 10){
             int map[3]= {0,2,1};
@@ -167,7 +167,7 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
         }
 
         if(w->mspel_bit) put_bits(&s->pb, 1, s->mspel);
-    
+
         if(w->abt_flag){
             put_bits(&s->pb, 1, w->per_mb_abt^1);
             if(!w->per_mb_abt){
@@ -176,14 +176,14 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
         }
 
         if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table);
-        
+
         if(!s->per_mb_rl_table){
             code012(&s->pb, s->rl_table_index);
             s->rl_chroma_table_index = s->rl_table_index;
         }
         put_bits(&s->pb, 1, s->dc_table_index);
         put_bits(&s->pb, 1, s->mv_table_index);
-    
+
         s->inter_intra_pred= 0;//(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
     }
     s->esc3_level_length= 0;
@@ -194,7 +194,7 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
 
 // nearly idential to wmv1 but thats just because we dont use the useless M$ crap features
 // its duplicated here in case someone wants to add support for these carp features
-void ff_wmv2_encode_mb(MpegEncContext * s, 
+void ff_wmv2_encode_mb(MpegEncContext * s,
                        DCTELEM block[6][64],
                        int motion_x, int motion_y)
 {
@@ -204,7 +204,7 @@ void ff_wmv2_encode_mb(MpegEncContext * s,
     uint8_t *coded_block;
 
     handle_slices(s);
-    
+
     if (!s->mb_intra) {
 	/* compute cbp */
         set_stat(ST_INTER_MB);
@@ -213,14 +213,14 @@ void ff_wmv2_encode_mb(MpegEncContext * s,
 	    if (s->block_last_index[i] >= 0)
 		cbp |= 1 << (5 - i);
 	}
-        
-        put_bits(&s->pb, 
-                 wmv2_inter_table[w->cbp_table_index][cbp + 64][1], 
+
+        put_bits(&s->pb,
+                 wmv2_inter_table[w->cbp_table_index][cbp + 64][1],
                  wmv2_inter_table[w->cbp_table_index][cbp + 64][0]);
 
         /* motion vector */
         h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
-        msmpeg4_encode_motion(s, motion_x - pred_x, 
+        msmpeg4_encode_motion(s, motion_x - pred_x,
                               motion_y - pred_y);
     } else {
 	/* compute cbp */
@@ -245,11 +245,11 @@ void ff_wmv2_encode_mb(MpegEncContext * s,
 
         if (s->pict_type == I_TYPE) {
             set_stat(ST_INTRA_MB);
-            put_bits(&s->pb, 
+            put_bits(&s->pb,
                      ff_msmp4_mb_i_table[coded_cbp][1], ff_msmp4_mb_i_table[coded_cbp][0]);
         } else {
-            put_bits(&s->pb, 
-                     wmv2_inter_table[w->cbp_table_index][cbp][1], 
+            put_bits(&s->pb,
+                     wmv2_inter_table[w->cbp_table_index][cbp][1],
                      wmv2_inter_table[w->cbp_table_index][cbp][0]);
         }
         set_stat(ST_INTRA_MB);
@@ -323,7 +323,7 @@ static int decode_ext_header(Wmv2Context *w){
     int code;
 
     if(s->avctx->extradata_size<4) return -1;
-    
+
     init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size*8);
 
     fps                = get_bits(&gb, 5);
@@ -335,14 +335,14 @@ static int decode_ext_header(Wmv2Context *w){
     w->top_left_mv_flag= get_bits1(&gb);
     w->per_mb_rl_bit   = get_bits1(&gb);
     code               = get_bits(&gb, 3);
-    
+
     if(code==0) return -1;
 
     s->slice_height = s->mb_height / code;
 
     if(s->avctx->debug&FF_DEBUG_PICT_INFO){
-        av_log(s->avctx, AV_LOG_DEBUG, "fps:%d, br:%d, qpbit:%d, abt_flag:%d, j_type_bit:%d, tl_mv_flag:%d, mbrl_bit:%d, code:%d, flag3:%d, slices:%d\n", 
-        fps, s->bit_rate, w->mspel_bit, w->abt_flag, w->j_type_bit, w->top_left_mv_flag, w->per_mb_rl_bit, code, w->flag3, 
+        av_log(s->avctx, AV_LOG_DEBUG, "fps:%d, br:%d, qpbit:%d, abt_flag:%d, j_type_bit:%d, tl_mv_flag:%d, mbrl_bit:%d, code:%d, flag3:%d, slices:%d\n",
+        fps, s->bit_rate, w->mspel_bit, w->abt_flag, w->j_type_bit, w->top_left_mv_flag, w->per_mb_rl_bit, code, w->flag3,
         code);
     }
     return 0;
@@ -374,7 +374,7 @@ return -1;
     s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);
     if(s->qscale < 0)
        return -1;
-       
+
     return 0;
 }
 
@@ -385,11 +385,11 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s)
     if (s->pict_type == I_TYPE) {
         if(w->j_type_bit) w->j_type= get_bits1(&s->gb);
         else              w->j_type= 0; //FIXME check
-        
+
         if(!w->j_type){
             if(w->per_mb_rl_bit) s->per_mb_rl_table= get_bits1(&s->gb);
             else                 s->per_mb_rl_table= 0;
-        
+
             if(!s->per_mb_rl_table){
                 s->rl_chroma_table_index = decode012(&s->gb);
                 s->rl_table_index = decode012(&s->gb);
@@ -400,10 +400,10 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s)
         s->inter_intra_pred= 0;
         s->no_rounding = 1;
         if(s->avctx->debug&FF_DEBUG_PICT_INFO){
-	    av_log(s->avctx, AV_LOG_DEBUG, "qscale:%d rlc:%d rl:%d dc:%d mbrl:%d j_type:%d \n", 
+	    av_log(s->avctx, AV_LOG_DEBUG, "qscale:%d rlc:%d rl:%d dc:%d mbrl:%d j_type:%d \n",
 		s->qscale,
 		s->rl_chroma_table_index,
-		s->rl_table_index, 
+		s->rl_table_index,
 		s->dc_table_index,
                 s->per_mb_rl_table,
                 w->j_type);
@@ -427,7 +427,7 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s)
 
         if(w->mspel_bit) s->mspel= get_bits1(&s->gb);
         else             s->mspel= 0; //FIXME check
-    
+
         if(w->abt_flag){
             w->per_mb_abt= get_bits1(&s->gb)^1;
             if(!w->per_mb_abt){
@@ -437,7 +437,7 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s)
 
         if(w->per_mb_rl_bit) s->per_mb_rl_table= get_bits1(&s->gb);
         else                 s->per_mb_rl_table= 0;
-        
+
         if(!s->per_mb_rl_table){
             s->rl_table_index = decode012(&s->gb);
             s->rl_chroma_table_index = s->rl_table_index;
@@ -445,14 +445,14 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s)
 
         s->dc_table_index = get_bits1(&s->gb);
         s->mv_table_index = get_bits1(&s->gb);
-    
+
         s->inter_intra_pred= 0;//(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
         s->no_rounding ^= 1;
-        
+
         if(s->avctx->debug&FF_DEBUG_PICT_INFO){
-            av_log(s->avctx, AV_LOG_DEBUG, "rl:%d rlc:%d dc:%d mv:%d mbrl:%d qp:%d mspel:%d per_mb_abt:%d abt_type:%d cbp:%d ii:%d\n", 
-		s->rl_table_index, 
-		s->rl_chroma_table_index, 
+            av_log(s->avctx, AV_LOG_DEBUG, "rl:%d rlc:%d dc:%d mv:%d mbrl:%d qp:%d mspel:%d per_mb_abt:%d abt_type:%d cbp:%d ii:%d\n",
+		s->rl_table_index,
+		s->rl_chroma_table_index,
 		s->dc_table_index,
 		s->mv_table_index,
                 s->per_mb_rl_table,
@@ -466,7 +466,7 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s)
     }
     s->esc3_level_length= 0;
     s->esc3_run_length= 0;
-    
+
 s->picture_number++; //FIXME ?
 
 
@@ -484,18 +484,18 @@ s->picture_number++; //FIXME ?
 static inline int wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr){
     MpegEncContext * const s= &w->s;
     int ret;
-   
+
     ret= msmpeg4_decode_motion(s, mx_ptr, my_ptr);
-   
+
     if(ret<0) return -1;
-   
+
     if((((*mx_ptr)|(*my_ptr)) & 1) && s->mspel)
         w->hshift= get_bits1(&s->gb);
-    else 
+    else
         w->hshift= 0;
 
 //printf("%d %d  ", *mx_ptr, *my_ptr);
-   
+
     return 0;
 }
 
@@ -512,17 +512,17 @@ static int16_t *wmv2_pred_motion(Wmv2Context *w, int *px, int *py){
     A = s->current_picture.motion_val[0][xy - 1];
     B = s->current_picture.motion_val[0][xy - wrap];
     C = s->current_picture.motion_val[0][xy + 2 - wrap];
-    
+
     if(s->mb_x && !s->first_slice_line && !s->mspel && w->top_left_mv_flag)
         diff= FFMAX(ABS(A[0] - B[0]), ABS(A[1] - B[1]));
-    else 
+    else
         diff=0;
-    
+
     if(diff >= 8)
         type= get_bits1(&s->gb);
     else
         type= 2;
-    
+
     if(type == 0){
         *px= A[0];
         *py= A[1];
@@ -548,12 +548,12 @@ static inline int wmv2_decode_inter_block(Wmv2Context *w, DCTELEM *block, int n,
     static const int sub_cbp_table[3]= {2,3,1};
     int sub_cbp;
 
-    if(!cbp){ 
+    if(!cbp){
         s->block_last_index[n] = -1;
 
         return 0;
     }
-    
+
     if(w->per_block_abt)
         w->abt_type= decode012(&s->gb);
 #if 0
@@ -574,7 +574,7 @@ static inline int wmv2_decode_inter_block(Wmv2Context *w, DCTELEM *block, int n,
             if (msmpeg4_decode_block(s, block, n, 1, scantable) < 0)
                 return -1;
         }
-        
+
         if(sub_cbp&2){
             if (msmpeg4_decode_block(s, w->abt_block2[n], n, 1, scantable) < 0)
                 return -1;
@@ -618,9 +618,9 @@ void ff_wmv2_add_mb(MpegEncContext *s, DCTELEM block1[6][64], uint8_t *dest_y, u
     wmv2_add_block(w, block1[1], dest_y + 8                , s->linesize, 1);
     wmv2_add_block(w, block1[2], dest_y +     8*s->linesize, s->linesize, 2);
     wmv2_add_block(w, block1[3], dest_y + 8 + 8*s->linesize, s->linesize, 3);
-    
+
     if(s->flags&CODEC_FLAG_GRAY) return;
-    
+
     wmv2_add_block(w, block1[4], dest_cb                   , s->uvlinesize, 4);
     wmv2_add_block(w, block1[5], dest_cr                   , s->uvlinesize, 5);
 }
@@ -634,12 +634,12 @@ void ff_mspel_motion(MpegEncContext *s,
     uint8_t *ptr;
     int dxy, offset, mx, my, src_x, src_y, v_edge_pos, linesize, uvlinesize;
     int emu=0;
-    
+
     dxy = ((motion_y & 1) << 1) | (motion_x & 1);
     dxy = 2*dxy + w->hshift;
     src_x = s->mb_x * 16 + (motion_x >> 1);
     src_y = s->mb_y * 16 + (motion_y >> 1);
-                
+
     /* WARNING: do no forget half pels */
     v_edge_pos = s->v_edge_pos;
     src_x = clip(src_x, -16, s->width);
@@ -651,7 +651,7 @@ void ff_mspel_motion(MpegEncContext *s,
     if(s->flags&CODEC_FLAG_EMU_EDGE){
         if(src_x<1 || src_y<1 || src_x + 17  >= s->h_edge_pos
                               || src_y + h+1 >= v_edge_pos){
-            ff_emulated_edge_mc(s->edge_emu_buffer, ptr - 1 - s->linesize, s->linesize, 19, 19, 
+            ff_emulated_edge_mc(s->edge_emu_buffer, ptr - 1 - s->linesize, s->linesize, 19, 19,
                              src_x-1, src_y-1, s->h_edge_pos, s->v_edge_pos);
             ptr= s->edge_emu_buffer + 1 + s->linesize;
             emu=1;
@@ -680,7 +680,7 @@ void ff_mspel_motion(MpegEncContext *s,
         mx >>= 1;
         my >>= 1;
     }
-    
+
     src_x = s->mb_x * 8 + mx;
     src_y = s->mb_y * 8 + my;
     src_x = clip(src_x, -8, s->width >> 1);
@@ -692,7 +692,7 @@ void ff_mspel_motion(MpegEncContext *s,
     offset = (src_y * uvlinesize) + src_x;
     ptr = ref_picture[1] + offset;
     if(emu){
-        ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, 
+        ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9,
                          src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);
         ptr= s->edge_emu_buffer;
     }
@@ -700,7 +700,7 @@ void ff_mspel_motion(MpegEncContext *s,
 
     ptr = ref_picture[2] + offset;
     if(emu){
-        ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, 
+        ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9,
                          src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);
         ptr= s->edge_emu_buffer;
     }
@@ -715,7 +715,7 @@ static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
     uint8_t *coded_val;
 
     if(w->j_type) return 0;
-    
+
     if (s->pict_type == P_TYPE) {
         if(IS_SKIP(s->current_picture.mb_type[s->mb_y * s->mb_stride + s->mb_x])){
             /* skip mb */
@@ -735,7 +735,7 @@ static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
         if (code < 0)
             return -1;
 	s->mb_intra = (~code & 0x40) >> 6;
-            
+
         cbp = code & 0x3f;
     } else {
         s->mb_intra = 1;
@@ -761,7 +761,7 @@ static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
         int mx, my;
 //printf("P at %d %d\n", s->mb_x, s->mb_y);
         wmv2_pred_motion(w, &mx, &my);
-        
+
         if(cbp){
             s->dsp.clear_blocks(s->block[0]);
             if(s->per_mb_rl_table){
@@ -776,7 +776,7 @@ static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
             }else
                 w->per_block_abt=0;
         }
-        
+
         if (wmv2_decode_motion(w, &mx, &my) < 0)
             return -1;
 
@@ -791,7 +791,7 @@ static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
 	        av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding inter block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
 	        return -1;
 	    }
-        }    
+        }
     } else {
 //if(s->pict_type==P_TYPE)
 //   printf("%d%d ", s->inter_intra_pred, cbp);
@@ -805,7 +805,7 @@ static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
             s->rl_table_index = decode012(&s->gb);
             s->rl_chroma_table_index = s->rl_table_index;
         }
-    
+
         s->dsp.clear_blocks(s->block[0]);
         for (i = 0; i < 6; i++) {
             if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0)
@@ -813,7 +813,7 @@ static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
 	        av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding intra block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
 	        return -1;
 	    }
-        }    
+        }
     }
 
     return 0;
@@ -821,12 +821,12 @@ static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
 
 static int wmv2_decode_init(AVCodecContext *avctx){
     Wmv2Context * const w= avctx->priv_data;
-    
+
     if(ff_h263_decode_init(avctx) < 0)
         return -1;
-    
+
     wmv2_common_init(w);
-    
+
     return 0;
 }