[FFmpeg-cvslog] Merge commit 'be1e1373d267bae2af8a62d79eef736736f24565'
Michael Niedermayer
git at videolan.org
Thu Oct 10 12:03:59 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 10 11:57:14 2013 +0200| [c2555bcbd147d068c47363ba294e9c21cfceb6c7] | committer: Michael Niedermayer
Merge commit 'be1e1373d267bae2af8a62d79eef736736f24565'
* commit 'be1e1373d267bae2af8a62d79eef736736f24565':
flvenc: Support muxing VP6A as well
Conflicts:
libavformat/flvenc.c
See: 42ae83c196d5747e8a87772a50a02a7b3f2855c3
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2555bcbd147d068c47363ba294e9c21cfceb6c7
---
More information about the ffmpeg-cvslog
mailing list