ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Oct 17
14:08:40 2014 +0200| [61c6e69709ca202bfd1df6b0c651c79a9b8e7622] | committer:
Michael Niedermayer
Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'
* commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a':
avconv: check return value
Conflicts:
ffmpeg.c
See: 4930cd13d634d5f4e284de3a955d5c6a84fd65e2
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61c6e69709ca202bfd1df6b0c651c79a9b8e7622
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
