[FFmpeg-cvslog] Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'
Michael Niedermayer
git at videolan.org
Fri Mar 20 20:27:05 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 20 19:55:44 2015 +0100| [50255b7a865f0dd4fecf8d1e337f96b92b4b406e] | committer: Michael Niedermayer
Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'
* commit '342fc46c69199b076b7c210f42208ce39a2bde1c':
cmdutils: Add a stream specifier to map usable streams
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50255b7a865f0dd4fecf8d1e337f96b92b4b406e
---
More information about the ffmpeg-cvslog
mailing list