message typo fixes

[ffmpeg] / libavcodec / mpegaudiodec.c

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index b9fc6fd052497fc223c2c01a7189085d9a2b8722..84cd42569c341a7736a4ec7f7cc303f343a24638 100644 (file)
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -2534,7 +2534,7 @@ retry:
     if(ff_mpa_check_header(header) < 0){
         buf++;
 //        buf_size--;
-        av_log(avctx, AV_LOG_ERROR, "header missing skiping one byte\n");
+        av_log(avctx, AV_LOG_ERROR, "Header missing skipping one byte.\n");
         goto retry;
     }
 
@@ -2574,12 +2574,12 @@ retry:
     if(out_size>=0)
         *data_size = out_size;
     else
-        av_log(avctx, AV_LOG_DEBUG, "Error while decoding mpeg audio frame\n"); //FIXME return -1 / but also return the number of bytes consumed
+        av_log(avctx, AV_LOG_DEBUG, "Error while decoding MPEG audio frame.\n"); //FIXME return -1 / but also return the number of bytes consumed
     s->frame_size = 0;
     return buf_size;
 }
 
-
+#ifdef CONFIG_MP3ADU_DECODER
 static int decode_frame_adu(AVCodecContext * avctx,
                         void *data, int *data_size,
                         uint8_t * buf, int buf_size)
@@ -2627,8 +2627,9 @@ static int decode_frame_adu(AVCodecContext * avctx,
     *data_size = out_size;
     return buf_size;
 }
+#endif /* CONFIG_MP3ADU_DECODER */
 
-
+#ifdef CONFIG_MP3ON4_DECODER
 /* Next 3 arrays are indexed by channel config number (passed via codecdata) */
 static int mp3Frames[16] = {0,1,1,2,3,3,4,5,2};   /* number of mp3 decoder instances */
 static int mp3Channels[16] = {0,1,2,3,4,5,6,8,4}; /* total output channels */
@@ -2785,8 +2786,9 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
     *data_size = out_size;
     return buf_size;
 }
+#endif /* CONFIG_MP3ON4_DECODER */
 
-
+#ifdef CONFIG_MP2_DECODER
 AVCodec mp2_decoder =
 {
     "mp2",
@@ -2799,7 +2801,8 @@ AVCodec mp2_decoder =
     decode_frame,
     CODEC_CAP_PARSE_ONLY,
 };
-
+#endif
+#ifdef CONFIG_MP3_DECODER
 AVCodec mp3_decoder =
 {
     "mp3",
@@ -2812,7 +2815,8 @@ AVCodec mp3_decoder =
     decode_frame,
     CODEC_CAP_PARSE_ONLY,
 };
-
+#endif
+#ifdef CONFIG_MP3ADU_DECODER
 AVCodec mp3adu_decoder =
 {
     "mp3adu",
@@ -2825,7 +2829,8 @@ AVCodec mp3adu_decoder =
     decode_frame_adu,
     CODEC_CAP_PARSE_ONLY,
 };
-
+#endif
+#ifdef CONFIG_MP3ON4_DECODER
 AVCodec mp3on4_decoder =
 {
     "mp3on4",
@@ -2838,3 +2843,4 @@ AVCodec mp3on4_decoder =
     decode_frame_mp3on4,
     0
 };
+#endif