[patch] FLAC patch

ffmpeg-remove-incorrect-request_sample_fmt-settin.patch (text/plain), 1.37 KB, created by zolar czakl on 2012-12-01 19:39:09 UTC

From ec5050119fbd120593c2e75456b88e00a3e1581b Mon Sep 17 00:00:00 2001
From: Uoti Urpala <[e-mail]>
Date: Wed, 14 Nov 2012 15:28:35 +0200
Subject: [PATCH] ad_ffmpeg: remove incorrect request_sample_fmt setting

Commit 91a18f3998 ("audio, libav: support planar Libav audio formats")
added a line setting request_sample_fmt to AV_SAMPLE_FMT_S16P. This
broke FLAC decoding with libavcodec versions since July but without
libavresample (in July the FLAC decoder got the ability to support
either planar or interleaved, depending on request_sample_fmt;
requesting planar without libavresample causes failure). According
to the author this line was left over from testing. Remove.
---
 libmpcodecs/ad_ffmpeg.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c
index fb9ff43..4780749 100644
--- a/libmpcodecs/ad_ffmpeg.c
+++ b/libmpcodecs/ad_ffmpeg.c
@@ -239,7 +239,6 @@ static int init(sh_audio_t *sh_audio)
         lavc_context->bits_per_coded_sample = sh_audio->wf->wBitsPerSample;
     }
     lavc_context->request_channels = opts->audio_output_channels;
-    lavc_context->request_sample_fmt = AV_SAMPLE_FMT_S16P;
     lavc_context->codec_tag = sh_audio->format; //FOURCC
     lavc_context->codec_type = AVMEDIA_TYPE_AUDIO;
     lavc_context->codec_id = lavc_codec->id; // not sure if required, imho not --A'rpi
-- 
1.7.8.6