Michael Niedermayer 927022a753 Merge commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf' ...

* commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf':
  avconv: get rid of ugly casts in the options table.
  avconv: try to match codecs by codec descriptor name as a last resort.
  avtools: fix show_foo() signatures.

Conflicts:
	cmdutils.c
	cmdutils.h
	cmdutils_common_opts.h
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c

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

2012-08-20 15:48:21 +02:00

14 KiB

Raw Blame History

View Raw