Merge commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 12:25:38 +0000 (14:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 12:25:38 +0000 (14:25 +0200)
* commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a':
  h261: Move shared data tables from a header to a proper C file

Conflicts:
libavcodec/Makefile
libavcodec/h261data.c
libavcodec/h261dec.c
libavcodec/h261enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/Makefile
libavcodec/h261.h
libavcodec/h261data.c
libavcodec/h261dec.c
libavcodec/h261enc.c

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -294,8 -295,10 +296,10 @@@ void ff_h261_encode_mb(MpegEncContext *
      h->previous_mba = h->current_mba;
  
      if (HAS_CBP(h->mtype)) {
 -        assert(cbp > 0);
 +        av_assert1(cbp > 0);
-         put_bits(&s->pb, ff_h261_cbp_tab[cbp - 1][1], ff_h261_cbp_tab[cbp - 1][0]);
+         put_bits(&s->pb,
+                  ff_h261_cbp_tab[cbp - 1][1],
+                  ff_h261_cbp_tab[cbp - 1][0]);
      }
      for (i = 0; i < 6; i++)
          /* encode each block */