1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer 040a796dab 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>
2012-05-19 20:31:24 +02:00
..
2012-04-16 15:27:39 +02:00
2012-04-19 22:52:34 +02:00
2012-04-28 16:39:54 +02:00
2012-05-10 04:17:03 +02:00
2012-05-07 02:42:00 +02:00
2012-05-01 23:20:52 +02:00
2012-05-19 12:29:30 +02:00
2012-04-06 08:32:09 +02:00
2012-03-30 05:16:15 +02:00
2012-05-08 08:41:26 +02:00
2012-03-31 12:37:42 +02:00
2012-05-08 03:47:58 +02:00
2012-05-15 11:16:34 +02:00
2012-04-19 15:08:13 +02:00
2012-05-08 10:37:13 +02:00
2012-04-18 15:30:34 +02:00
2012-05-18 23:34:11 +02:00
2012-04-03 19:12:52 +02:00