Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 16:30:52 +0000 (17:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 16:41:31 +0000 (17:41 +0100)
commit6db37c9468051ff34cac58fa428bc5d86fc1ee45
treeac578a2ae106cb9a15f37769a87f5d4cf1dd3405
parent71cf094e1be086bce4c535b1fe0d96a0449486ae
parent5c7db097ebe1fb5c233cedd8846615074e7d6044
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@gmx.at>
cmdutils.c
cmdutils.h
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c