Merge commit 'ae35d91d44c5e676af3d146bf8d05b241c467675'

* commit 'ae35d91d44c5e676af3d146bf8d05b241c467675':
  h261: Move ff_h261_rl_table_store declaration to header file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/21/head
Michael Niedermayer 12 years ago
commit fa871b1bde
  1. 2
      libavcodec/h261.h
  2. 2
      libavcodec/h261dec.c
  3. 2
      libavcodec/h261enc.c

@ -48,4 +48,6 @@ typedef struct H261Context{
#define MB_TYPE_H261_FIL 0x800000
extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3];
#endif /* AVCODEC_H261_H */

@ -40,8 +40,6 @@
#define MBA_STUFFING 33
#define MBA_STARTCODE 34
extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3];
static VLC h261_mba_vlc;
static VLC h261_mtype_vlc;
static VLC h261_mv_vlc;

@ -32,8 +32,6 @@
#include "h261.h"
#include "h261data.h"
extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3];
static void h261_encode_block(H261Context * h, int16_t * block,
int n);

Loading…
Cancel
Save