X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Friff.h;h=3bd309f86b903ba5774e2f731434690008668e6d;hb=681ed0009905a088aae2a5caf2308d89aaa80562;hp=dc970f619d62e60104f464d27ee2b75f61184c1f;hpb=5b21bdabe43611385d1d55a21d5b1f607b133d29;p=ffmpeg

diff --git a/libavformat/riff.h b/libavformat/riff.h
index dc970f619d6..3bd309f86b9 100644
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -2,53 +2,62 @@
  * RIFF codec tags
  * copyright (c) 2000 Fabrice Bellard
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
- * @file riff.h
+ * @file
  * internal header for RIFF based (de)muxers
  * do NOT include this in end user applications
  */
 
-#ifndef FFMPEG_RIFF_H
-#define FFMPEG_RIFF_H
+#ifndef AVFORMAT_RIFF_H
+#define AVFORMAT_RIFF_H
 
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 #include "avio.h"
+#include "internal.h"
+#include "metadata.h"
 
-offset_t start_tag(ByteIOContext *pb, const char *tag);
-void end_tag(ByteIOContext *pb, offset_t start);
+extern const AVMetadataConv ff_riff_info_conv[];
+extern const char ff_riff_tags[][5];
 
-typedef struct AVCodecTag {
-    int id;
-    unsigned int tag;
-} AVCodecTag;
+int64_t ff_start_tag(AVIOContext *pb, const char *tag);
+void ff_end_tag(AVIOContext *pb, int64_t start);
 
-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);
-void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size);
+/**
+ * Read BITMAPINFOHEADER structure and set AVStream codec width, height and
+ * bits_per_encoded_sample fields. Does not read extradata.
+ * @return codec tag
+ */
+int ff_get_bmp_header(AVIOContext *pb, AVStream *st);
 
-extern const AVCodecTag codec_bmp_tags[];
-extern const AVCodecTag codec_wav_tags[];
+void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf);
+int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc);
+enum CodecID ff_wav_codec_get_id(unsigned int tag, int bps);
+int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size);
 
-unsigned int codec_get_tag(const AVCodecTag *tags, int id);
-enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag);
+extern const AVCodecTag ff_codec_bmp_tags[];
+extern const AVCodecTag ff_codec_wav_tags[];
+
+unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum CodecID id);
+enum CodecID ff_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 /* FFMPEG_RIFF_H */
+int ff_read_riff_info(AVFormatContext *s, int64_t size);
+
+#endif /* AVFORMAT_RIFF_H */