DCA: ARM/NEON optimised lfe_fir

[ffmpeg] / libavcodec / pcm-mpeg.c

diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c
index 4612ac2371f863addae9aa1f59b27c8322cfdc56..20c1db92f1050334cec465202e8ea532167cfbdd 100644 (file)
--- a/libavcodec/pcm-mpeg.c
+++ b/libavcodec/pcm-mpeg.c
@@ -145,12 +145,6 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx,
     sample_size = (num_source_channels * avctx->bits_per_coded_sample) >> 3;
     samples = buf_size / sample_size;
 
-    if (avctx->debug & FF_DEBUG_BITSTREAM)
-        dprintf(avctx,
-                "pcm_bluray_decode_frame: c: %d sc: %d s: %d in: %d ds: %d\n",
-                avctx->channels, num_source_channels, num_samples, buf_size,
-                *data_size);
-
     output_size = samples * avctx->channels *
                   (avctx->sample_fmt == SAMPLE_FMT_S32 ? 4 : 2);
     if (output_size > *data_size) {
@@ -303,14 +297,14 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx,
 
 AVCodec pcm_bluray_decoder = {
     "pcm_bluray",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_PCM_BLURAY,
     0,
     NULL,
     NULL,
     NULL,
     pcm_bluray_decode_frame,
-    .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16, SAMPLE_FMT_S32,
+    .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16, SAMPLE_FMT_S32,
                                          SAMPLE_FMT_NONE},
     .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"),
 };