Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 12:45:57 +0000 (13:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 12:45:57 +0000 (13:45 +0100)
commit076300bf8b43d5d56a91cd2ad845d596969c87cf
tree487b8a917a0125e4cc086ccbcf575727ebb0b289
parent7dc0ed80e877a16a11ba45d747723d88e8a92cd8
parentbfe5454cd238b16e7977085f880205229103eccb
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>
22 files changed:
libavcodec/x86/dsputilenc.asm
libavformat/aiff.h
libavformat/au.c
libavformat/cafdec.c
libavformat/gxfenc.c
libavformat/internal.h
libavformat/isom.c
libavformat/lxfdec.c
libavformat/nsvdec.c
libavformat/nut.c
libavformat/nut.h
libavformat/nutdec.c
libavformat/nutenc.c
libavformat/omadec.c
libavformat/riff.c
libavformat/riff.h
libavformat/rmdec.c
libavformat/rsodec.c
libavformat/smjpegenc.c
libavformat/swf.h
libavformat/voc.h
tests/fate/vpx.mak