diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-10 04:12:08 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-10 04:12:08 +0400 |
commit | 8e31dbc1dcb56d40bcc1dd45840aaef0d37bae51 (patch) | |
tree | 08342b8eede67521c32c139ebb4d9ddd04e871fa /libavcodec/aacdec.c | |
parent | 1af9fdc3baa47596757da7c401d58710cef45c75 (diff) | |
parent | ffae713a5b3a0d20ff958d8bd58a052b495c38fd (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix a bunch of common typos.
build: Skip compiling xvmc.h under the correct condition.
configure: darwin: Change dylib install names to include major version.
mpegts: Always honor a registration descriptor if present and there is no other codec information.
aacdec: Fix SCE parity check.
aacdec: Fix out of array writes (stack).
rtsp: Only set the ttl parameter if the server actually gave a value
udp: Set ttl for read-write streams, too, not only for write-only ones
udp: Only bind to the multicast address if in read-only mode
udp: Clarify the comment about binding the multicast address
udp: Reorder comments
Conflicts:
libavcodec/aacdec.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
-rw-r--r-- | libavcodec/aacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 966a2116d6..d220f14933 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -227,7 +227,7 @@ static uint64_t sniff_channel_order(uint8_t (*layout_map)[3], int tags) int num_front_channels, num_side_channels, num_back_channels; uint64_t layout; - if(FF_ARRAY_ELEMS(e2c_vec) < tags) + if (FF_ARRAY_ELEMS(e2c_vec) < tags) return 0; i = 0; |