OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
10ed02e
)
dca: avoid C99 declaration in for() expression
author
Gianluigi Tiesi
<mplayer@netfarm.it>
Tue, 1 Feb 2011 04:12:26 +0000
(
04:12
+0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 2 Feb 2011 02:40:50 +0000
(
03:40
+0100)
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
e86e858111501650bb9ce8e39282e20c57bac913
)
libavcodec/dca.c
patch
|
blob
|
history
diff --git
a/libavcodec/dca.c
b/libavcodec/dca.c
index
3861813
..
3a3eb25
100644
(file)
--- a/
libavcodec/dca.c
+++ b/
libavcodec/dca.c
@@
-1354,7
+1354,9
@@
static int dca_exss_mask2count(int mask)
*/
static void dca_exss_skip_mix_coeffs(GetBitContext *gb, int channels, int out_ch)
{
- for (int i = 0; i < channels; i++) {
+ int i;
+
+ for (i = 0; i < channels; i++) {
int mix_map_mask = get_bits(gb, out_ch);
int num_coeffs = av_popcount(mix_map_mask);
skip_bits_long(gb, num_coeffs * 6);