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-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-01 23:20:52 +02:00
2012-04-06 22:52:01 +02:00
2012-05-10 02:25:41 +02:00
2012-04-06 22:52:01 +02:00
2012-05-01 23:20:52 +02:00
2012-04-06 22:52:01 +02:00
2012-03-29 04:11:10 +02:00
2012-04-07 22:41:37 +02:00
2012-04-06 22:52:01 +02:00
2012-05-01 23:20:52 +02:00
2012-04-01 21:21:13 +02:00
2012-05-16 03:12:45 +02:00
2012-04-19 22:52:34 +02:00
2012-04-06 22:52:01 +02:00
2012-04-28 16:39:54 +02:00
2012-04-19 21:23:52 +02:00
2012-04-28 20:45:06 +02:00
2012-04-06 19:19:59 +03:00
2012-04-06 22:52:01 +02:00
2012-05-10 04:17:03 +02:00
2012-04-20 22:18:26 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-08 22:02:59 +02:00
2012-05-08 22:02:59 +02:00
2012-05-05 20:22:09 +02:00
2012-05-07 02:42:00 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-01 23:20:52 +02:00
2012-05-08 22:02:59 +02:00
2012-05-01 23:20:52 +02:00
2012-05-14 20:17:24 +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-01 23:20:52 +02:00
2012-05-08 08:41:26 +02:00
2012-04-14 22:37:43 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-03 19:37:14 +02:00
2012-05-03 19:37:14 +02:00
2012-04-19 21:43:15 +02:00
2012-04-14 18:21:19 +02:00
2012-04-06 22:52:01 +02:00
2012-03-31 12:37:42 +02:00
2012-05-10 02:25:41 +02:00
2012-04-30 22:18:43 +02:00
2012-04-06 22:52:01 +02:00
2012-04-27 19:19:36 +02:00
2012-05-01 23:20:52 +02:00
2012-05-19 20:31:24 +02:00
2012-05-15 07:41:23 +02:00
2012-05-08 03:47:58 +02:00
2012-05-13 16:49:17 +02:00
2012-05-05 14:46:38 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-06 21:53:19 +02:00
2012-05-14 02:41:36 +02:00
2012-05-11 14:13:07 +02:00
2012-05-15 11:16:34 +02:00
2012-04-06 22:52:01 +02:00
2012-04-19 15:08:13 +02:00
2012-04-20 20:58:45 +02:00
2012-04-03 10:11:27 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-06 21:53:19 +02:00
2012-04-06 22:52:01 +02:00
2012-05-08 10:37:13 +02:00
2012-05-16 03:13:35 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-14 14:15:34 +02:00
2012-04-01 00:36:43 +02:00
2012-03-29 04:11:10 +02:00
2012-04-18 15:30:34 +02:00
2012-05-05 00:00:40 +02:00
2012-05-06 12:00:19 +02:00
2012-04-16 18:36:39 +02:00
2012-04-16 18:36:39 +02:00
2012-05-10 17:22:27 +02:00
2012-05-10 02:25:41 +02:00
2012-05-01 23:20:52 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-13 00:39:19 +02:00
2012-04-06 22:52:01 +02:00
2012-05-16 22:15:59 +02:00
2012-04-20 22:18:26 +02:00
2012-04-29 13:03:15 +02:00
2012-05-01 23:20:52 +02:00
2012-05-19 00:52:25 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-05-06 21:53:19 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-04-06 22:52:01 +02:00
2012-05-10 02:25:41 +02:00
2012-05-10 02:25:41 +02:00
2012-04-08 20:55:11 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-10 00:01:45 +02:00
2012-03-29 04:11:10 +02:00
2012-05-04 14:40:22 +02:00
2012-04-16 02:18:09 +02:00
2012-04-28 20:45:06 +02:00
2012-04-06 22:52:01 +02:00
2012-04-22 11:23:58 +02:00
2012-05-01 23:20:52 +02:00
2012-05-01 23:20:52 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-18 23:34:11 +02:00
2012-04-03 19:12:52 +02:00
2012-03-29 04:11:10 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-14 19:32:43 +02:00
2012-05-16 22:32:05 +02:00
2012-04-06 22:52:01 +02:00
2012-05-14 23:40:46 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-22 15:29:34 +02:00
2012-04-21 19:42:44 +02:00
2012-04-06 22:52:01 +02:00
2012-05-08 16:53:03 +02:00