From 3d55340c6d22e68ee6b9eaac44fa80969fc1ba4b Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 22 Jun 2015 15:02:03 +0200 Subject: af: restore detaching of PCM filters when using spdif Basically, af_fix_format_conversion() behaves stupid you insert a conversion filter that won't work, and adding back the conversion test function is the simplest fix to it. --- audio/filter/af_lavrresample.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'audio/filter/af_lavrresample.c') diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c index 7c2d7315e2..89fe2c414c 100644 --- a/audio/filter/af_lavrresample.c +++ b/audio/filter/af_lavrresample.c @@ -178,6 +178,12 @@ static int check_output_conversion(int mp_format) return af_to_avformat(mp_format); } +bool af_lavrresample_test_conversion(int src_format, int dst_format) +{ + return af_to_avformat(src_format) != AV_SAMPLE_FMT_NONE && + check_output_conversion(dst_format) != AV_SAMPLE_FMT_NONE; +} + // mp_chmap_get_reorder() performs: // to->speaker[n] = from->speaker[src[n]] // but libavresample does: -- cgit v1.2.3