| author | Uoti Urpala <uau@mplayer2.org> | 2012-11-14 13:28:35 (UTC) |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2012-11-14 13:28:35 (UTC) |
| commit | ec5050119fbd120593c2e75456b88e00a3e1581b (patch) (side-by-side diff) | |
| tree | d6c1b999d02aa526de8840985152c8e2343a6d8a | |
| parent | 7639f31aec89f977c67b930a8cc9acfff4948e3b (diff) | |
| download | mplayer2-ec5050119fbd120593c2e75456b88e00a3e1581b.tar.bz2 | |
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.
| -rw-r--r-- | 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 |