diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-06-09 19:11:50 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-06-09 19:11:50 +0000 |
| commit | 7408ad05ccc39636022573ad160eaeabe72c0b03 (patch) | |
| tree | c71f787f0f86e4f0bfed06d406a4ba339e24f24b | |
| parent | 5e20f836b3ad06a591ff232e742ef17c9c235297 (diff) | |
| download | ffmpeg-7408ad05ccc39636022573ad160eaeabe72c0b03.tar.gz | |
10l
Originally committed as revision 1940 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/cabac.h | 6 | ||||
| -rw-r--r-- | libavformat/avienc.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h index f0c4910d5b..a49e156316 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -43,9 +43,9 @@ typedef struct CABACContext{ PutBitContext pb; }CABACContext; -const uint8_t ff_h264_lps_range[64][4]; -const uint8_t ff_h264_mps_state[64]; -const uint8_t ff_h264_lps_state[64]; +extern const uint8_t ff_h264_lps_range[64][4]; +extern const uint8_t ff_h264_mps_state[64]; +extern const uint8_t ff_h264_lps_state[64]; void ff_init_cabac_encoder(CABACContext *c, uint8_t *buf, int buf_size); void ff_init_cabac_decoder(CABACContext *c, uint8_t *buf, int buf_size); diff --git a/libavformat/avienc.c b/libavformat/avienc.c index c7c15f9e72..a803e761e3 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -164,6 +164,7 @@ const CodecTag codec_bmp_tags[] = { { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') }, { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, { CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') }, + { CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') }, { 0, 0 }, }; |