Files
ffmpeg/libavcodec
Michael Niedermayer cd37963684 Merge commit '381dc1a5ec0925b281c573457c413ae643567086'
* commit '381dc1a5ec0925b281c573457c413ae643567086':
  fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
  fate: Add shorthands for acodec PCM and ADPCM tests
  avconv: Drop unused function argument from do_video_stats()
  cmdutils: Conditionally compile libswscale-related bits
  aacenc: Drop some unused function arguments
  rtsp: Avoid a cast when calling strtol
  nut: support textual data
  nutenc: verbosely report unsupported negative pts

Conflicts:
	cmdutils.c
	ffmpeg.c
	libavformat/nut.c
	libavformat/nutenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 13:52:03 +01:00
..
2012-10-08 02:09:28 +02:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-10-09 04:00:55 +02:00
2012-08-15 22:32:06 +03:00
2012-09-21 01:03:31 +02:00
2012-10-29 21:13:50 +01:00
2012-10-20 15:33:44 +02:00
2012-10-19 00:08:01 +00:00
2012-10-29 21:13:50 +01:00
2012-10-29 05:21:47 +01:00
2012-05-18 23:34:11 +02:00
2012-10-29 20:06:52 +00:00
2012-10-14 05:48:02 +02:00
2012-10-18 20:29:03 +02:00
2012-09-04 18:37:54 +03:00
2012-10-12 17:58:15 +02:00
2012-08-15 22:32:06 +03:00
2012-09-07 12:36:00 +02:00
2012-07-19 18:44:46 +02:00
2012-09-30 14:05:04 +00:00
2012-10-25 21:51:45 +00:00
2012-10-09 16:48:43 +02:00
2012-06-07 21:07:17 +02:00
2012-10-21 18:22:50 +02:00
2012-10-21 18:22:50 +02:00
2012-07-10 02:17:52 +02:00
2012-10-14 22:16:31 +02:00
2012-10-15 03:18:08 +02:00
2012-05-18 23:34:11 +02:00
2012-10-13 03:54:04 +02:00
2012-10-13 03:54:04 +02:00
2012-04-22 22:26:55 +02:00
2012-10-19 00:08:01 +00:00
2012-07-22 05:18:01 +02:00
2012-10-19 00:08:02 +00:00
2012-10-27 02:06:21 +02:00
2012-05-18 23:34:11 +02:00
2012-09-03 23:26:14 +02:00
2012-10-18 21:42:04 +02:00
2012-10-12 01:44:35 +02:00
2012-10-14 21:45:42 +02:00
2012-07-05 02:54:34 +00:00
2012-10-03 16:14:59 +02:00
2012-10-13 08:22:26 +00:00
2012-06-29 20:43:30 +02:00
2012-10-13 16:02:09 +00:00
2012-06-29 20:43:30 +02:00
2012-07-29 22:02:46 +02:00
2012-09-10 21:04:01 +02:00
2012-10-01 13:42:44 -04:00
2012-10-25 01:38:15 +02:00
2012-06-21 01:30:16 +00:00
2012-10-29 20:06:52 +00:00
2012-10-15 15:09:46 +02:00
2012-09-18 17:37:41 +02:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 22:49:23 -05:00
2012-10-21 17:29:10 +02:00
2012-10-19 03:36:42 +02:00
2012-10-12 18:17:10 +03:00
2012-10-10 16:48:13 +00:00
2012-10-27 04:32:40 +02:00
2012-09-23 15:24:08 +02:00
2012-06-29 20:43:30 +02:00
2012-10-13 18:00:48 +00:00
2012-10-15 13:28:23 +00:00