[FFmpeg-cvslog] Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'

Michael Niedermayer git at videolan.org
Thu Jul 3 21:22:33 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul  3 21:02:56 2014 +0200| [524eeaca228043c93d0f94ffe9c51149c0408f04] | committer: Michael Niedermayer

Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'

* commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0':
  ismindex: Add an option for outputting files elsewhere than in the current directory

Conflicts:
	tools/ismindex.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=524eeaca228043c93d0f94ffe9c51149c0408f04
---





More information about the ffmpeg-cvslog mailing list