diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 16:25:38 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 16:25:38 +0400 |
| commit | 567616c1b34a5fca1ecba82a6ff85939b6a1371e (patch) | |
| tree | e973b46942bd0a8d91992b144c4133e3332a6b16 /libavcodec/h261enc.c | |
| parent | 38d1a5a27024b90523f9c688677f423ed67e4649 (diff) | |
| parent | 8a776ad90e00ab2b98e8683ac6182d641a383c3a (diff) | |
Merge commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a'
* 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>
Diffstat (limited to 'libavcodec/h261enc.c')
| -rw-r--r-- | libavcodec/h261enc.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index bfdb3e68b6..23b8964dcc 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -30,7 +30,6 @@ #include "mpegvideo.h" #include "h263.h" #include "h261.h" -#include "h261data.h" int ff_h261_get_picture_format(int width, int height) { @@ -254,7 +253,8 @@ void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64], } /* MB is not skipped, encode MBA */ - put_bits(&s->pb, ff_h261_mba_bits[(h->current_mba - h->previous_mba) - 1], + put_bits(&s->pb, + ff_h261_mba_bits[(h->current_mba - h->previous_mba) - 1], ff_h261_mba_code[(h->current_mba - h->previous_mba) - 1]); /* calculate MTYPE */ @@ -273,7 +273,9 @@ void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64], if (s->dquant) h->mtype++; - put_bits(&s->pb, ff_h261_mtype_bits[h->mtype], ff_h261_mtype_code[h->mtype]); + put_bits(&s->pb, + ff_h261_mtype_bits[h->mtype], + ff_h261_mtype_code[h->mtype]); h->mtype = ff_h261_mtype_map[h->mtype]; @@ -295,7 +297,9 @@ void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64], if (HAS_CBP(h->mtype)) { 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 */ |