diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 19:26:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 19:39:42 +0100 |
| commit | 6747b0be9b2a8e20724c6e514b3c8374c32fd6f0 (patch) | |
| tree | abd4ec6a6d46098aeb9e2537f7977ed35b904d77 /libavcodec/mlp_parser.c | |
| parent | d4e5d8d4c264955f3df8c6947b38913f9ee3eb18 (diff) | |
| download | ffmpeg-6747b0be9b2a8e20724c6e514b3c8374c32fd6f0.tar.gz | |
mlp: fix channel order.
This fixes a regression introduced with todays merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlp_parser.c')
| -rw-r--r-- | libavcodec/mlp_parser.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index 1831f64a4b..2cc4b9153a 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -157,6 +157,7 @@ int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb) skip_bits(gb, 11); + mh->channel_arrangement= channel_arrangement = get_bits(gb, 5); mh->channels_mlp = mlp_channels[channel_arrangement]; mh->channel_layout_mlp = ff_mlp_layout[channel_arrangement]; @@ -170,6 +171,7 @@ int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb) skip_bits(gb, 8); + mh->channel_arrangement= channel_arrangement = get_bits(gb, 5); mh->channels_thd_stream1 = truehd_channels(channel_arrangement); mh->channel_layout_thd_stream1 = ff_truehd_layout(channel_arrangement); |