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