* commit '4326bc36':
  lavf: Do not list mov-only codecs in riff tags

Conflicts:
	libavformat/Makefile
	libavformat/avidec.c

See: 2e0b5f5cMerged-by: Michael Niedermayer <michaelni@gmx.at>