[FFmpeg-cvslog] Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'
Michael Niedermayer
git at videolan.org
Tue Oct 29 21:45:09 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 29 21:38:53 2013 +0100| [0460b9bb3e34472223084a6c3ad35b4ded9c276b] | committer: Michael Niedermayer
Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'
* commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29':
avconv: stop accessing AVStream.parser
Conflicts:
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0460b9bb3e34472223084a6c3ad35b4ded9c276b
---
More information about the ffmpeg-cvslog
mailing list