[FFmpeg-cvslog] Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 29 13:45:57 2012 +0100| [076300bf8b43d5d56a91cd2ad845d596969c87cf] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=076300bf8b43d5d56a91cd2ad845d596969c87cf
---