diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 13:37:04 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 13:37:09 +0100 |
commit | 6deaab360c9c79e686265c99b9f9afc1d0068a8f (patch) | |
tree | 1197e5035e76d517af4ea3d469e29f8e8412ce67 /libavcodec/wmavoice.c | |
parent | 0ebdf8d9ec603c895dc84f405d973922952d22b7 (diff) | |
parent | 72c0b8f724a71d2784aecad0e5221e7ab6206371 (diff) | |
download | ffmpeg-6deaab360c9c79e686265c99b9f9afc1d0068a8f.tar.gz |
Merge commit '72c0b8f724a71d2784aecad0e5221e7ab6206371'
* commit '72c0b8f724a71d2784aecad0e5221e7ab6206371':
ljpeg: remove a commented-out line
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmavoice.c')
0 files changed, 0 insertions, 0 deletions