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