ffmpeg/ffmpeg.h at 77e8bd8ce62a968b5ba318635f94de3dd8cce7eb

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-05-12 05:52:42 +02:00

Files

T

Michael Niedermayer 70a25587d2 Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

* commit '67f2a688143b644f99360565a9f36c61a5f052e9':
  avconv: remove a write-only variable

Conflicts:
	ffmpeg.c
	ffmpeg.h

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

2014-02-24 21:08:19 +01:00

15 KiB

Raw Blame History

View Raw

15 KiB Raw Blame History

15 KiB

Raw Blame History