spoke too fast, fix dv fourcc in mov accordingly if strict

[ffmpeg] / libavformat / riff.h

diff --git a/libavformat/riff.h b/libavformat/riff.h
index cd2b85d85f4fd6d61d663248932cdbc098b4c8b4..dc970f619d62e60104f464d27ee2b75f61184c1f 100644 (file)
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -25,8 +25,11 @@
  * do NOT include this in end user applications
  */
 
-#ifndef FF_RIFF_H
-#define FF_RIFF_H
+#ifndef FFMPEG_RIFF_H
+#define FFMPEG_RIFF_H
+
+#include "avcodec.h"
+#include "avio.h"
 
 offset_t start_tag(ByteIOContext *pb, const char *tag);
 void end_tag(ByteIOContext *pb, offset_t start);
@@ -46,22 +49,6 @@ extern const AVCodecTag codec_wav_tags[];
 
 unsigned int codec_get_tag(const AVCodecTag *tags, int id);
 enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag);
-/**
- * @deprecated Use av_codec_get_tag instead.
- */
-unsigned int codec_get_bmp_tag(int id) attribute_deprecated;
-/**
- * @deprecated Use av_codec_get_tag instead.
- */
-unsigned int codec_get_wav_tag(int id) attribute_deprecated;
-/**
- * @deprecated Use av_codec_get_id instead.
- */
-enum CodecID codec_get_bmp_id(unsigned int tag) attribute_deprecated;
-/**
- * @deprecated Use av_codec_get_id instead.
- */
-enum CodecID codec_get_wav_id(unsigned int tag) attribute_deprecated;
 void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);
 
-#endif
+#endif /* FFMPEG_RIFF_H */