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

12 KiB

Raw Blame History

View Raw