* commit '02d76141':
  riff: Add 'tshd' FourCC for H.264

Conflicts:
	libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>