Reformat rdt_demuxer AVCodec struct sanely.

[ffmpeg] / libavformat / ape.c

diff --git a/libavformat/ape.c b/libavformat/ape.c
index a90f887e587293fbe9eabcc9fdbc10d4f0fe1c37..34b1d14b21a232d00a9b1520f30ef72dcc003959 100644 (file)
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define ENABLE_DEBUG 0
@@ -156,7 +157,6 @@ static void ape_parse_tag(AVFormatContext *s)
 
     get_buffer(pb, buf, 8);    /* APETAGEX */
     if (strncmp(buf, "APETAGEX", 8)) {
-        av_log(NULL, AV_LOG_ERROR, "Invalid APE Tags\n");
         return;
     }
 
@@ -425,7 +425,7 @@ static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap)
     st->codec->codec_tag       = MKTAG('A', 'P', 'E', ' ');
     st->codec->channels        = ape->channels;
     st->codec->sample_rate     = ape->samplerate;
-    st->codec->bits_per_sample = ape->bps;
+    st->codec->bits_per_coded_sample = ape->bps;
     st->codec->frame_size      = MAC_SUBFRAME_SIZE;
 
     st->nb_frames = ape->totalframes;
@@ -512,7 +512,7 @@ static int ape_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
 
 AVInputFormat ape_demuxer = {
     "ape",
-    "Monkey's Audio",
+    NULL_IF_CONFIG_SMALL("Monkey's Audio"),
     sizeof(APEContext),
     ape_probe,
     ape_read_header,