diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-07 14:43:37 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-07 14:43:37 +0200 |
commit | 9285f25e31a73900148b6fe6643ed82b055619cb (patch) | |
tree | d6ed9d79d39d9070866d5f34aeb967260ddcb309 /libavcodec/mjpegdec.c | |
parent | 1aa50348d8bc74fad59bca4f2c52b05ac0f92a60 (diff) | |
parent | 60a1ee6e419e244dc2363fdc4ddf8350d506f2ae (diff) | |
download | ffmpeg-9285f25e31a73900148b6fe6643ed82b055619cb.tar.gz |
Merge commit '60a1ee6e419e244dc2363fdc4ddf8350d506f2ae' into release/0.10
* commit '60a1ee6e419e244dc2363fdc4ddf8350d506f2ae':
doc: Fix some obsolete references to av* tools as ff* tools
Conflicts:
doc/indevs.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
0 files changed, 0 insertions, 0 deletions