ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Jul 2
00:34:24 2015 +0200| [03b2b40fd7f010fc245d36c05c7439c058b927bf] | committer:
Michael Niedermayer
Merge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de'
* commit 'a31c4b2cbef9aee15910fc3df52519aef46760de':
fate-g2m3: disable the audio stream
Conflicts:
tests/ref/fate/g2m3
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03b2b40fd7f010fc245d36c05c7439c058b927bf
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
