diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-22 04:31:30 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-22 04:31:30 +0300 |
| commit | 7431eabaabb7d5d72f26b6d46a3333aa9cf0cd96 (patch) | |
| tree | 4990bd44fde568a7cd7440eb895008e0bc760c00 /libaf/af_lavcac3enc.c | |
| parent | 95da34aa071d64b21ef3e952b987ba3dcee84ca0 (diff) | |
| parent | 2b8b5b7053030fd77ee53cc2069a8f44838564d4 (diff) | |
| download | mpv-7431eabaabb7d5d72f26b6d46a3333aa9cf0cd96.tar.bz2 mpv-7431eabaabb7d5d72f26b6d46a3333aa9cf0cd96.tar.xz | |
Merge svn changes up to r29544
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 e217ffc86c..628c397002 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); |