diff options
| author | tack <tack@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-18 22:24:36 +0000 |
|---|---|---|
| committer | tack <tack@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-18 22:24:36 +0000 |
| commit | f89696a8e2225fb9e65e8b0699cf2ce632dcef2e (patch) | |
| tree | c2b2e508a8ecf2ef8d5fedb9e364d0edfbc893a9 /libaf/af_lavcac3enc.c | |
| parent | 3961e12fca2f1ec10c64e3ff298828feecca52c9 (diff) | |
| download | mpv-f89696a8e2225fb9e65e8b0699cf2ce632dcef2e.tar.bz2 mpv-f89696a8e2225fb9e65e8b0699cf2ce632dcef2e.tar.xz | |
Fix incorrect channel ordering for lavc audio codecs (specifically ffac3,
ffdca, ffflac, ffaac, fftruehd). In the process, adds support for 32-bit
samples.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29533 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf/af_lavcac3enc.c')
| -rw-r--r-- | libaf/af_lavcac3enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libaf/af_lavcac3enc.c b/libaf/af_lavcac3enc.c index f89302f4a6..dd6863320f 100644 --- a/libaf/af_lavcac3enc.c +++ b/libaf/af_lavcac3enc.c @@ -212,7 +212,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) if (c->nch >= 5) reorder_channel_nch(s->pending_data, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, - AF_CHANNEL_LAYOUT_LAVC_AC3_DEFAULT, + AF_CHANNEL_LAYOUT_LAVC_DEFAULT, c->nch, s->expect_len / 2, 2); @@ -224,7 +224,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) if (c->nch >= 5) reorder_channel_nch(src, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, - AF_CHANNEL_LAYOUT_LAVC_AC3_DEFAULT, + AF_CHANNEL_LAYOUT_LAVC_DEFAULT, c->nch, s->expect_len / 2, 2); len = avcodec_encode_audio(s->lavc_actx,dest,destsize,(void *)src); |