Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Mar 2015 19:48:39 +0000 (20:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Mar 2015 19:48:39 +0000 (20:48 +0100)
commit59f687b73ceb40e53314c5c1607669e97fcd9d13
treed6926c4183116e3ac3bbb7cf17556fad0dd702fa
parent182499be721e568255185a4541d72b5ac78408a2
parent02d76141d68e38c80f9a205a56b9af10d74f0995
Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'

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

Conflicts:
libavformat/riff.c

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