diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 14:16:42 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 14:27:48 +0200 |
commit | b0ba2bf8c66fdae9761b36647b813c830984fb6c (patch) | |
tree | ddd021d6f0082139baac1bd50ff4f54bf4016dc9 /libavcodec/wma.c | |
parent | 8d14596bc241b32aa08a6885c7c1dbfcd0566948 (diff) | |
parent | fab694dd3931b1c0bc3c598c3f88b1902c14a303 (diff) | |
download | ffmpeg-b0ba2bf8c66fdae9761b36647b813c830984fb6c.tar.gz |
Merge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303'
* commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303':
lavf: move a variable declaration to the block where it's used
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma.c')
0 files changed, 0 insertions, 0 deletions