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 /libmpcodecs/ae_lavc.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 'libmpcodecs/ae_lavc.c')
| -rw-r--r-- | libmpcodecs/ae_lavc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c index 205893189b..81b76ee062 100644 --- a/libmpcodecs/ae_lavc.c +++ b/libmpcodecs/ae_lavc.c @@ -106,7 +106,7 @@ static int encode_lavc(audio_encoder_t *encoder, uint8_t *dest, void *src, int s !strcmp(lavc_acodec->name,"libfaac"))) { int isac3 = !strcmp(lavc_acodec->name,"ac3"); reorder_channel_nch(src, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, - isac3 ? AF_CHANNEL_LAYOUT_LAVC_AC3_DEFAULT + isac3 ? AF_CHANNEL_LAYOUT_LAVC_DEFAULT : AF_CHANNEL_LAYOUT_AAC_DEFAULT, encoder->params.channels, size / 2, 2); |