riff: Move functions around to be covered by appropriate #ifdefs

[ffmpeg] / libavformat / ffmetadec.c

diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c
index 9774e946b25f4ecb9fdaa570e15fd16fc1459282..7dbf7ed35d056fe75904e52be75d084e75389893 100644 (file)
--- a/libavformat/ffmetadec.c
+++ b/libavformat/ffmetadec.c
@@ -138,7 +138,7 @@ static int read_header(AVFormatContext *s)
                 return -1;
 
             st->codec->codec_type = AVMEDIA_TYPE_DATA;
-            st->codec->codec_id   = CODEC_ID_FFMETADATA;
+            st->codec->codec_id   = AV_CODEC_ID_FFMETADATA;
 
             m = &st->metadata;
         } else if (!memcmp(line, ID_CHAPTER, strlen(ID_CHAPTER))) {
@@ -168,7 +168,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
 
 AVInputFormat ff_ffmetadata_demuxer = {
     .name        = "ffmetadata",
-    .long_name   = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"),
+    .long_name   = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text"),
     .read_probe  = probe,
     .read_header = read_header,
     .read_packet = read_packet,