Do not use libswscale HEAD version, but older, that compiles with the demo

[frescor/ffmpeg.git] / libavformat / riff.h

diff --git a/libavformat/riff.h b/libavformat/riff.h
index 240855a8b23be082cdb00c00510e90c12aaffb6c..d287929eb8379eb6067beaac1b63218d8be5427f 100644 (file)
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -19,33 +19,36 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FF_RIFF_H
-#define FF_RIFF_H
+/**
+ * @file libavformat/riff.h
+ * internal header for RIFF based (de)muxers
+ * do NOT include this in end user applications
+ */
+
+#ifndef AVFORMAT_RIFF_H
+#define AVFORMAT_RIFF_H
+
+#include "libavcodec/avcodec.h"
+#include "avio.h"
 
-offset_t start_tag(ByteIOContext *pb, const char *tag);
-void end_tag(ByteIOContext *pb, offset_t start);
+int64_t start_tag(ByteIOContext *pb, const char *tag);
+void end_tag(ByteIOContext *pb, int64_t start);
 
-typedef struct CodecTag {
+typedef struct AVCodecTag {
     int id;
     unsigned int tag;
-    unsigned int invalid_asf : 1;
-} CodecTag;
+} AVCodecTag;
 
-void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const CodecTag *tags, int for_asf);
+void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf);
 int put_wav_header(ByteIOContext *pb, AVCodecContext *enc);
-int wav_codec_get_id(unsigned int tag, int bps);
+enum CodecID wav_codec_get_id(unsigned int tag, int bps);
 void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size);
 
-extern const CodecTag codec_bmp_tags[];
-extern const CodecTag codec_wav_tags[];
+extern const AVCodecTag codec_bmp_tags[];
+extern const AVCodecTag codec_wav_tags[];
 
-unsigned int codec_get_tag(const CodecTag *tags, int id);
-enum CodecID codec_get_id(const CodecTag *tags, unsigned int tag);
-unsigned int codec_get_bmp_tag(int id);
-unsigned int codec_get_wav_tag(int id);
-enum CodecID codec_get_bmp_id(unsigned int tag);
-enum CodecID codec_get_wav_id(unsigned int tag);
-unsigned int codec_get_asf_tag(const CodecTag *tags, unsigned int id);
+unsigned int codec_get_tag(const AVCodecTag *tags, int id);
+enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag);
 void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);
 
-#endif
+#endif /* AVFORMAT_RIFF_H */