summaryrefslogtreecommitdiff
path: root/libswresample/audioconvert.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-28 11:19:22 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-28 13:02:58 +0200
commitedbde5222688c18eecd7a589779aa8696b64a6ab (patch)
tree28405bcbcb939665b6e8e2b0efbb160f66168239 /libswresample/audioconvert.c
parent9d4a1aca883965cfc2bbc5a6f9c9d8f4b93f9d74 (diff)
downloadffmpeg-edbde5222688c18eecd7a589779aa8696b64a6ab.tar.gz
swr: change sample format representation so as to maintain the planer/packed distinction.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/audioconvert.c')
-rw-r--r--libswresample/audioconvert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libswresample/audioconvert.c b/libswresample/audioconvert.c
index 7598bba05d..26cf471ab4 100644
--- a/libswresample/audioconvert.c
+++ b/libswresample/audioconvert.c
@@ -122,7 +122,7 @@ AudioConvert *swri_audio_convert_alloc(enum AVSampleFormat out_fmt,
int flags)
{
AudioConvert *ctx;
- conv_func_type *f = fmt_pair_to_conv_functions[out_fmt + AV_SAMPLE_FMT_NB*in_fmt];
+ conv_func_type *f = fmt_pair_to_conv_functions[av_get_packed_sample_fmt(out_fmt) + AV_SAMPLE_FMT_NB*av_get_packed_sample_fmt(in_fmt)];
if (!f)
return NULL;