diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 13:31:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 13:36:49 +0200 |
| commit | d56ced5fbf3c76ebd5c5b015695101c634e53e4a (patch) | |
| tree | 3916bdbb37f0de94ca4a63a740436a115796b97a /libavcodec/wmaenc.c | |
| parent | fb8dde37e4b0d7966194bc614a1040eee902c4e1 (diff) | |
| parent | bf5b5d2b1561535cc013c12ab8033228bb0d0081 (diff) | |
| download | ffmpeg-d56ced5fbf3c76ebd5c5b015695101c634e53e4a.tar.gz | |
Merge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'
* commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081':
avfilter.c: cosmetics, reformat
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmaenc.c')
0 files changed, 0 insertions, 0 deletions