[FFmpeg-cvslog] Merge commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3'

Michael Niedermayer git at videolan.org
Thu Jun 26 22:12:22 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 26 21:55:11 2014 +0200| [8eb1174a9ed35ba2735ec6874b0da87052185c9d] | committer: Michael Niedermayer

Merge commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3'

* commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3':
  output example: use a struct to bundle the video stream variables together

Conflicts:
	doc/examples/muxing.c

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

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





More information about the ffmpeg-cvslog mailing list