1. 17 Apr, 2012 1 commit
    • Michael Niedermayer's avatar
      Merge commit '3b266da3' · 47787831
      Michael Niedermayer authored
      * commit '3b266da3':
        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: 's avatarMichael Niedermayer <michaelni@gmx.at>
      47787831
  2. 16 Apr, 2012 22 commits
  3. 15 Apr, 2012 17 commits