virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'ade75fb811500f3e3f284737f123938d83be728f'

Browse Source 
* commit 'ade75fb811500f3e3f284737f123938d83be728f':
  (e)ac3: clip surround mix level indexes.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-19 21:46:27 +01:00
commit 10f1ee2f92
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ac3dec.c
View File

@ -237,9 +237,9 @@ static int ac3_parse_header(AC3DecodeContext *s)
if (get_bits1(gbc)) {
s->preferred_downmix = get_bits(gbc, 2);
s->center_mix_level_ltrt = get_bits(gbc, 3);
s->surround_mix_level_ltrt = get_bits(gbc, 3);
s->surround_mix_level_ltrt = av_clip(get_bits(gbc, 3), 3, 7);
s->center_mix_level = get_bits(gbc, 3);
s->surround_mix_level = get_bits(gbc, 3);
s->surround_mix_level = av_clip(get_bits(gbc, 3), 3, 7);
}
if (get_bits1(gbc)) {
s->dolby_surround_ex_mode = get_bits(gbc, 2);

4
libavcodec/eac3dec.c
View File

@ -353,8 +353,8 @@ int ff_eac3_parse_header(AC3DecodeContext *s)
}
if (s->channel_mode & 4) {
/* if a surround channel exists */
s->surround_mix_level_ltrt = get_bits(gbc, 3);
s->surround_mix_level = get_bits(gbc, 3);
s->surround_mix_level_ltrt = av_clip(get_bits(gbc, 3), 3, 7);
s->surround_mix_level = av_clip(get_bits(gbc, 3), 3, 7);
}
}