cosmetics, move up mpeg1video mp4 objecttype

[ffmpeg] / libavformat / oggdec.h

diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index 09407d2ff65d0704a1a0ca3baec1a9d99a3f6ca2..93ae444a6bd91db0f1654ed749b3905bab7661d3 100644 (file)
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -22,10 +22,9 @@
     DEALINGS IN THE SOFTWARE.
 **/
 
-#ifndef FFMPEG_OGGDEC_H
-#define FFMPEG_OGGDEC_H
+#ifndef AVFORMAT_OGGDEC_H
+#define AVFORMAT_OGGDEC_H
 
-#include <stdint.h>
 #include "avformat.h"
 
 typedef struct ogg_codec {
@@ -76,16 +75,16 @@ typedef struct ogg {
 #define OGG_FLAG_BOS  2
 #define OGG_FLAG_EOS  4
 
-extern ogg_codec_t flac_codec;
-extern ogg_codec_t ogm_audio_codec;
-extern ogg_codec_t ogm_old_codec;
-extern ogg_codec_t ogm_text_codec;
-extern ogg_codec_t ogm_video_codec;
-extern ogg_codec_t old_flac_codec;
-extern ogg_codec_t speex_codec;
-extern ogg_codec_t theora_codec;
-extern ogg_codec_t vorbis_codec;
+extern const ogg_codec_t ff_flac_codec;
+extern const ogg_codec_t ff_ogm_audio_codec;
+extern const ogg_codec_t ff_ogm_old_codec;
+extern const ogg_codec_t ff_ogm_text_codec;
+extern const ogg_codec_t ff_ogm_video_codec;
+extern const ogg_codec_t ff_old_flac_codec;
+extern const ogg_codec_t ff_speex_codec;
+extern const ogg_codec_t ff_theora_codec;
+extern const ogg_codec_t ff_vorbis_codec;
 
 extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
 
-#endif /* FFMPEG_OGGDEC_H */
+#endif /* AVFORMAT_OGGDEC_H */