FFmpeg/libavformat
Michael Niedermayer 076300bf8b Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'
* commit 'bfe5454cd238b16e7977085f880205229103eccb':
  lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
  lavf: move "MP3 " fourcc from riff to nut
  fate: vpx: Add dependencies
  fate: Fix wavpack-matroskamode test dependencies
  x86: dsputilenc: port to cpuflags

Conflicts:
	libavformat/internal.h
	libavformat/nut.c
	tests/fate/vpx.mak

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