Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Apr 2012 02:01:17 +0000 (04:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Apr 2012 02:03:50 +0000 (04:03 +0200)
commit4778783160fb8d7aa39dafdabc756f1691b830f7
tree4b79ab7e0bcefb304b8a4f3c32908d3217d6b4a9
parentdcd207c4cbcd9dd72b73e5b544c055b29885be64
parent3b266da3d35f3f7a61258b78384dfe920d875d29
Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'

* commit '3b266da3d35f3f7a61258b78384dfe920d875d29':
  avconv: add support for complex filtergraphs.
  avconv: make filtergraphs global.
  avconv: move filtered_frame from InputStream to OutputStream.
  avconv: don't set output width/height directly from input value.
  avconv: move resample_{width,height,pix_fmt} to InputStream.
  avconv: remove a useless variable from OutputStream.
  avconv: get output pixel format from lavfi.
  graphparser: fix the order in which unlabeled input links are returned.
  avconv: change {input,output}_{streams,files} into arrays of pointers.
  avconv: don't pass input/output streams to some functions.

Conflicts:
cmdutils.c
cmdutils.h
doc/ffmpeg.texi
ffmpeg.c
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.h
doc/ffmpeg.texi
doc/filters.texi
ffmpeg.c
ffplay.c
libavfilter/graphparser.c
libavfilter/sink_buffer.c
tests/codec-regression.sh