diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-03 23:21:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-03 23:21:26 +0200 |
| commit | 0c06ca7a8ab46df0268d049e7c2067ef29a5f77d (patch) | |
| tree | a4f16925f82c2cca8fe993e7d6146f63aa894355 /libavcodec | |
| parent | 3ea5beab8f7352c94f71148ab98dd247412129a3 (diff) | |
| parent | a90d92ce2aeea8eaae5c616958d20e000e20b964 (diff) | |
| download | ffmpeg-0c06ca7a8ab46df0268d049e7c2067ef29a5f77d.tar.gz | |
Merge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964'
* commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964':
aac: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacadtsdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/aacadtsdec.c b/libavcodec/aacadtsdec.c index c9718c4599..d0814ac27e 100644 --- a/libavcodec/aacadtsdec.c +++ b/libavcodec/aacadtsdec.c @@ -31,7 +31,7 @@ int avpriv_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr) int size, rdb, ch, sr; int aot, crc_abs; - if(get_bits(gbc, 12) != 0xfff) + if (get_bits(gbc, 12) != 0xfff) return AAC_AC3_PARSE_ERROR_SYNC; skip_bits1(gbc); /* id */ @@ -39,10 +39,10 @@ int avpriv_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr) crc_abs = get_bits1(gbc); /* protection_absent */ aot = get_bits(gbc, 2); /* profile_objecttype */ sr = get_bits(gbc, 4); /* sample_frequency_index */ - if(!avpriv_mpeg4audio_sample_rates[sr]) + if (!avpriv_mpeg4audio_sample_rates[sr]) return AAC_AC3_PARSE_ERROR_SAMPLE_RATE; skip_bits1(gbc); /* private_bit */ - ch = get_bits(gbc, 3); /* channel_configuration */ + ch = get_bits(gbc, 3); /* channel_configuration */ skip_bits1(gbc); /* original/copy */ skip_bits1(gbc); /* home */ @@ -50,8 +50,8 @@ int avpriv_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr) /* adts_variable_header */ skip_bits1(gbc); /* copyright_identification_bit */ skip_bits1(gbc); /* copyright_identification_start */ - size = get_bits(gbc, 13); /* aac_frame_length */ - if(size < AAC_ADTS_HEADER_SIZE) + size = get_bits(gbc, 13); /* aac_frame_length */ + if (size < AAC_ADTS_HEADER_SIZE) return AAC_AC3_PARSE_ERROR_FRAME_SIZE; skip_bits(gbc, 11); /* adts_buffer_fullness */ |