Add support for Acelp.net fourcc and codecid, remuxing wav to avi should work

[ffmpeg] / libavcodec / mpeg12data.h

diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h
index 8d587540de16308c29a3ce54a5e959c6388c5546..5f04ac44bfbbcef12384e9c511a437657881be3f 100644 (file)
--- a/libavcodec/mpeg12data.h
+++ b/libavcodec/mpeg12data.h
@@ -29,22 +29,28 @@
 #define AVCODEC_MPEG12DATA_H
 
 #include <stdint.h>
-#include "mpegvideo.h"
+#include "libavutil/rational.h"
+#include "rl.h"
 
-extern const uint16_t vlc_dc_lum_code[12];
-extern const unsigned char vlc_dc_lum_bits[12];
-extern const uint16_t vlc_dc_chroma_code[12];
-extern const unsigned char vlc_dc_chroma_bits[12];
+extern const uint16_t ff_mpeg1_default_intra_matrix[64];
+extern const uint16_t ff_mpeg1_default_non_intra_matrix[64];
 
-extern RLTable rl_mpeg1;
-extern RLTable rl_mpeg2;
+extern const uint16_t ff_mpeg12_vlc_dc_lum_code[12];
+extern const unsigned char ff_mpeg12_vlc_dc_lum_bits[12];
+extern const uint16_t ff_mpeg12_vlc_dc_chroma_code[12];
+extern const unsigned char ff_mpeg12_vlc_dc_chroma_bits[12];
 
-extern const uint8_t mbAddrIncrTable[36][2];
-extern const uint8_t mbPatTable[64][2];
+extern RLTable ff_rl_mpeg1;
+extern RLTable ff_rl_mpeg2;
 
-extern const uint8_t mbMotionVectorTable[17][2];
+extern const uint8_t ff_mpeg12_mbAddrIncrTable[36][2];
+extern const uint8_t ff_mpeg12_mbPatTable[64][2];
 
-extern const float mpeg1_aspect[16];
-extern const AVRational mpeg2_aspect[16];
+extern const uint8_t ff_mpeg12_mbMotionVectorTable[17][2];
 
-#endif // AVCODEC_MPEG12DATA_H
+extern const AVRational ff_frame_rate_tab[];
+
+extern const float ff_mpeg1_aspect[16];
+extern const AVRational ff_mpeg2_aspect[16];
+
+#endif /* AVCODEC_MPEG12DATA_H */