[FFmpeg-cvslog] Merge commit '182d3f8221c23716ea4eafa460bdb94968f71f26'
Michael Niedermayer
git at videolan.org
Fri Jun 27 01:01:09 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 27 00:50:32 2014 +0200| [8469c73576f76a3390cd93455cc4b2fea1d29154] | committer: Michael Niedermayer
Merge commit '182d3f8221c23716ea4eafa460bdb94968f71f26'
* commit '182d3f8221c23716ea4eafa460bdb94968f71f26':
output example: rewrite encoding logic
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8469c73576f76a3390cd93455cc4b2fea1d29154
---
More information about the ffmpeg-cvslog
mailing list