1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Michael Niedermayer bb3ed3bae6 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: Add FATE tests for the Ut Video encoder
  lavc: add Ut Video encoder
  mpegvideo_enc: remove stray duplicate line from 7f9aaa4
  swscale: x86: fix #endif comments in rgb2rgb template file
  avconv: mark more options as expert.
  avconv: split printing "main options" into global and per-file.
  avconv: refactor help printing.

Conflicts:
	Changelog
	ffmpeg_opt.c
	ffserver.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-20 17:31:55 +02:00
..
2012-02-26 07:48:45 +01:00
2012-05-08 16:53:03 +02:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
caf
2012-05-14 13:05:30 +01:00
2012-05-10 04:17:03 +02:00
2012-03-12 17:01:58 +02:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
crc
2012-05-15 19:47:18 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-03-02 18:58:19 +02:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2012-08-10 12:18:38 +01:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2012-02-26 07:48:45 +01:00
2012-07-29 08:06:30 +02:00
2012-03-27 17:54:04 -07:00
2012-03-23 14:03:03 -07:00
2012-03-20 14:12:53 -04:00
md5
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
mtv
2012-05-15 11:16:34 +02:00
2012-08-03 15:18:12 +00:00
2012-08-03 15:18:12 +00:00
2012-07-10 00:04:23 +00:00
2012-05-14 12:50:01 +01:00
ptx
2012-07-17 17:06:24 +00:00
2012-02-26 07:48:45 +01:00
2012-04-01 15:56:08 -04:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-06-22 00:16:03 +00:00
sha
smc
2012-02-26 07:48:45 +01:00
2012-05-17 03:29:21 +02:00
2012-07-29 08:06:30 +02:00
2012-06-29 20:22:04 +02:00
2012-06-29 20:21:28 +02:00
2012-06-29 20:20:02 +02:00
2012-07-26 22:22:54 +02:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-06-22 00:16:03 +00:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-03-03 17:03:26 -05:00
2012-07-25 14:29:39 +02:00
2012-06-15 19:10:58 +02:00
2012-07-25 14:29:39 +02:00
2012-06-15 19:10:58 +02:00
w64
2012-02-26 07:48:45 +01:00
2012-07-29 08:06:30 +02:00
2012-07-29 08:06:30 +02:00
2012-07-29 08:06:30 +02:00
2012-07-04 15:10:57 +03:00
2012-03-22 19:52:56 +01:00