10l

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1940 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

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);

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 },
 };