diff options
| author | Michael Niedermayer | 2013-04-11 14:25:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2013-04-11 14:25:38 +0200 |
| commit | 567616c1b34a5fca1ecba82a6ff85939b6a1371e (patch) | |
| tree | e973b46942bd0a8d91992b144c4133e3332a6b16 /libavcodec/h261.h | |
| 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/h261.h')
| -rw-r--r-- | libavcodec/h261.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/h261.h b/libavcodec/h261.h index e673fdba1f..ff549628a3 100644 --- a/libavcodec/h261.h +++ b/libavcodec/h261.h @@ -29,6 +29,7 @@ #define AVCODEC_H261_H #include "mpegvideo.h" +#include "rl.h" /** * H261Context @@ -50,6 +51,15 @@ typedef struct H261Context { extern uint8_t ff_h261_rl_table_store[2][2 * MAX_RUN + MAX_LEVEL + 3]; +extern const uint8_t ff_h261_mba_code[35]; +extern const uint8_t ff_h261_mba_bits[35]; +extern const uint8_t ff_h261_mtype_code[10]; +extern const uint8_t ff_h261_mtype_bits[10]; +extern const int ff_h261_mtype_map[10]; +extern const uint8_t ff_h261_mv_tab[17][2]; +extern const uint8_t ff_h261_cbp_tab[63][2]; +extern RLTable ff_h261_rl_tcoeff; + void ff_h261_loop_filter(MpegEncContext *s); int ff_h261_get_picture_format(int width, int height); |