diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 11:34:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 11:34:07 +0200 |
| commit | 5f312139dff4072c3482a0b01daafcc1446d70c8 (patch) | |
| tree | 8209d82a04b408e2d7a77a6588239b87948a2bec /libavcodec/qdm2.c | |
| parent | 03853b1091e4a60c772677aa885e3d7e0ff19a12 (diff) | |
| parent | 45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c (diff) | |
| download | ffmpeg-5f312139dff4072c3482a0b01daafcc1446d70c8.tar.gz | |
Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'
* commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c':
qdm2: Whitespace cosmetics
flac: use meaningful return values
Conflicts:
libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qdm2.c')
| -rw-r--r-- | libavcodec/qdm2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 37bf0e8c68..3d5ff3316d 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -828,7 +828,7 @@ static int synthfilt_build_sb_samples(QDM2Context *q, GetBitContext *gb, if (length == 0) { // If no data use noise for (sb=sb_min; sb < sb_max; sb++) - build_sb_samples_from_noise (q, sb); + build_sb_samples_from_noise(q, sb); return 0; } @@ -841,12 +841,12 @@ static int synthfilt_build_sb_samples(QDM2Context *q, GetBitContext *gb, else if (sb >= 24) joined_stereo = 1; else - joined_stereo = (get_bits_left(gb) >= 1) ? get_bits1 (gb) : 0; + joined_stereo = (get_bits_left(gb) >= 1) ? get_bits1(gb) : 0; if (joined_stereo) { if (get_bits_left(gb) >= 16) for (j = 0; j < 16; j++) - sign_bits[j] = get_bits1 (gb); + sign_bits[j] = get_bits1(gb); for (j = 0; j < 64; j++) if (q->coding_method[1][sb][j] > q->coding_method[0][sb][j]) @@ -1071,7 +1071,7 @@ static int init_quantized_coeffs_elem0(int8_t *quantized_coeffs, * @param q context * @param gb bitreader context */ -static void init_tone_level_dequantization (QDM2Context *q, GetBitContext *gb) +static void init_tone_level_dequantization(QDM2Context *q, GetBitContext *gb) { int sb, j, k, n, ch; |