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-29 13:45:57 +01:00
2012-11-28 23:59:15 +01:00
2012-07-29 02:16:26 +02:00
2012-01-19 01:19:38 +01:00
2012-11-22 15:57:41 +01:00
2012-01-21 12:04:46 +01:00
2012-09-06 16:23:17 +02:00
2012-11-05 22:31:24 +00:00
2012-11-28 23:59:15 +01:00
2012-11-07 18:33:52 +01:00
2012-10-16 14:04:14 +02:00
2012-05-30 05:57:56 +02:00
2012-06-07 21:45:52 +02:00
2012-10-08 11:03:27 +02:00
2012-10-16 14:04:14 +02:00
2012-05-30 01:40:54 +02:00
2012-06-07 21:45:52 +02:00