[FFmpeg-cvslog] Merge commit '202b5f6deb65e405b07b9b5c20f97c8cb925cf49'
Michael Niedermayer
git at videolan.org
Tue Feb 19 12:24:09 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 19 12:12:17 2013 +0100| [4e469842b5254dda261223a23e53c5a0f539544d] | committer: Michael Niedermayer
Merge commit '202b5f6deb65e405b07b9b5c20f97c8cb925cf49'
* commit '202b5f6deb65e405b07b9b5c20f97c8cb925cf49':
doc: Fix some obsolete references to av* tools as ff* tools
Conflicts:
doc/demuxers.texi
No code changes, merge for metadata only
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e469842b5254dda261223a23e53c5a0f539544d
---
More information about the ffmpeg-cvslog
mailing list