[FFmpeg-cvslog] Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'

Michael Niedermayer git at videolan.org
Fri Oct 17 14:21:07 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | 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 <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61c6e69709ca202bfd1df6b0c651c79a9b8e7622
---





More information about the ffmpeg-cvslog mailing list