[FFmpeg-cvslog] Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 17 20:48:39 2015 +0100| [59f687b73ceb40e53314c5c1607669e97fcd9d13] | committer: Michael Niedermayer

Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'

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

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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