ffmpeg/ffmpeg.c at 61c6e69709ca202bfd1df6b0c651c79a9b8e7622

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 10:30:05 +01:00

Files

Michael Niedermayer 61c6e69709 Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'

* commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a':
  avconv: check return value

Conflicts:
	ffmpeg.c

See: 4930cd13d6
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-10-17 14:09:15 +02:00

137 KiB

Raw Blame History

View Raw

137 KiB Raw Blame History

137 KiB

Raw Blame History