Merge commit '755cd4197d53946208e042f095b930dca18d9430'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 May 2012 18:31:24 +0000 (20:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 May 2012 18:31:24 +0000 (20:31 +0200)
commit040a796dab2721abbbeceb3df8368e59254d6827
treeecc911ba7a60b4d8f083bbffb4c1362bd62065ad
parent612abe2773e72cc3942069c104294ab2223338eb
parent755cd4197d53946208e042f095b930dca18d9430
Merge commit '755cd4197d53946208e042f095b930dca18d9430'

* commit '755cd4197d53946208e042f095b930dca18d9430':
  mov: enable parsing for VC-1.
  lavfi: Add fps filter.
  lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs.
  avconv: add support for audio in complex filtergraphs.

Conflicts:
ffmpeg.c
libavfilter/version.h
libavformat/mov.c
tests/ref/fate/vc1-ism

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/filters.texi
ffmpeg.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/audio.c
libavfilter/version.h
libavfilter/video.c
libavformat/mov.c