diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 16:13:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 16:20:07 +0100 |
| commit | 7681b8e9a922b9c1b45d95e2585b716a1caed360 (patch) | |
| tree | abcd015f2c160784cae4ccef96abff2bc3b32601 /libavfilter/af_amix.c | |
| parent | 9dbedf331eca9903230368f28716f29e7375450a (diff) | |
| parent | 0a9132b84c0590500bb3d6b358219323805993fc (diff) | |
| download | ffmpeg-7681b8e9a922b9c1b45d95e2585b716a1caed360.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wnv1: cosmetics, reformat
xan: remove a trivially true if().
ansi: do not depend on get_buffer() initializing the frame.
zerocodec: remove an unused variable.
zmbv: remove some pointless comments and empty lines
Conflicts:
libavcodec/xan.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amix.c')
0 files changed, 0 insertions, 0 deletions