[FFmpeg-cvslog] Merge commit '9580818c5d934bde65a95efd2cee61c174721092'

Michael Niedermayer git at videolan.org
Mon May 5 15:57:53 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  5 15:42:26 2014 +0200| [d5ec1ddf7bb0beb65319c749afc8fba2798a8ee1] | committer: Michael Niedermayer

Merge commit '9580818c5d934bde65a95efd2cee61c174721092'

* commit '9580818c5d934bde65a95efd2cee61c174721092':
  avconv: rename OutputStream.opts to OutputStream.encoder_opts

Conflicts:
	ffmpeg.c
	ffmpeg.h

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

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





More information about the ffmpeg-cvslog mailing list