diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 20:48:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 20:48:39 +0100 |
| commit | 59f687b73ceb40e53314c5c1607669e97fcd9d13 (patch) | |
| tree | d6926c4183116e3ac3bbb7cf17556fad0dd702fa /ffplay.c | |
| parent | 182499be721e568255185a4541d72b5ac78408a2 (diff) | |
| parent | 02d76141d68e38c80f9a205a56b9af10d74f0995 (diff) | |
| download | ffmpeg-59f687b73ceb40e53314c5c1607669e97fcd9d13.tar.gz | |
Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'
* commit '02d76141d68e38c80f9a205a56b9af10d74f0995':
riff: Add 'tshd' FourCC for H.264
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions