[FFmpeg-cvslog] Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 17:30:52 2013 +0100| [6db37c9468051ff34cac58fa428bc5d86fc1ee45] | committer: Michael Niedermayer

Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'

* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
  avconv: pass libavresample options to AVFilterGraph

Conflicts:
	cmdutils.c
	cmdutils.h
	ffmpeg_filter.c
	ffmpeg_opt.c

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

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