ffmpeg/cmdutils.c at af4b1c02acf6923489d30349c4813a0d73b2f114

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 01:40:04 +01:00

Files

Michael Niedermayer af4b1c02ac Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
  avconv: use new options parser.

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_opt.c

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

2012-12-20 02:38:02 +01:00

61 KiB

Raw Blame History

View Raw

61 KiB Raw Blame History

61 KiB

Raw Blame History