[FFmpeg-cvslog] Merge commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 20 15:48:21 2012 +0200| [927022a75372b9e127c490c8cd87f027c3957dc3] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=927022a75372b9e127c490c8cd87f027c3957dc3
---