Factor tag reading code out of wav read_header()

[ffmpeg] / libavformat / bfi.c

diff --git a/libavformat/bfi.c b/libavformat/bfi.c
index c6efdd47e0d61414365f9f57d1f85def078d38cb..94014a49120472c58feb1577503601376afa672d 100644 (file)
--- a/libavformat/bfi.c
+++ b/libavformat/bfi.c
@@ -20,12 +20,13 @@
  */
 
 /**
- * @file bfi.c
+ * @file
  * @brief Brute Force & Ignorance (.bfi) file demuxer
  * @author Sisir Koppaka ( sisir.koppaka at gmail dot com )
  * @sa http://wiki.multimedia.cx/index.php?title=BFI
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 typedef struct BFIContext {
@@ -86,12 +87,12 @@ static int bfi_read_header(AVFormatContext * s, AVFormatParameters * ap)
 
     /* Set up the video codec... */
     av_set_pts_info(vstream, 32, 1, fps);
-    vstream->codec->codec_type = CODEC_TYPE_VIDEO;
+    vstream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
     vstream->codec->codec_id   = CODEC_ID_BFI;
     vstream->codec->pix_fmt    = PIX_FMT_PAL8;
 
     /* Set up the audio codec now... */
-    astream->codec->codec_type      = CODEC_TYPE_AUDIO;
+    astream->codec->codec_type      = AVMEDIA_TYPE_AUDIO;
     astream->codec->codec_id        = CODEC_ID_PCM_U8;
     astream->codec->channels        = 1;
     astream->codec->bits_per_coded_sample = 8;