diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:15:21 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:19:22 +0100 |
commit | 8c7de73e20ebd0435f7ddd75d57ffb7179c40b77 (patch) | |
tree | daa159f19d1d8008e8235ba13caf6ecdc58cca70 /libavcodec/mpc7.c | |
parent | dc5767ff0a2a20cd67d4a56d4b1cdd884449409f (diff) | |
parent | fd9147f11456a7e39a998d7270684922a2a46e6d (diff) | |
download | ffmpeg-8c7de73e20ebd0435f7ddd75d57ffb7179c40b77.tar.gz |
Merge commit 'fd9147f11456a7e39a998d7270684922a2a46e6d'
* commit 'fd9147f11456a7e39a998d7270684922a2a46e6d':
au: cosmetics: pretty-print and remove pointless comments
Conflicts:
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpc7.c')
0 files changed, 0 insertions, 0 deletions