[FFmpeg-cvslog] Merge commit '755cd4197d53946208e042f095b930dca18d9430'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 19 20:31:24 2012 +0200| [040a796dab2721abbbeceb3df8368e59254d6827] | committer: Michael Niedermayer

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 at gmx.at>

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