diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 21:16:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 21:17:11 +0200 |
| commit | 861dec5e90254818636a20188f2844222962bfdf (patch) | |
| tree | d57ed3c92f784532f364c3db60d76ca09a9425e7 /libavcodec/mjpeg.h | |
| parent | 9c56cf09ca6da8b89c3155dc50f75232571d0be7 (diff) | |
| parent | b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3 (diff) | |
| download | ffmpeg-861dec5e90254818636a20188f2844222962bfdf.tar.gz | |
Merge commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3'
* commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3':
riff: Add GMP4 fourcc for mpeg4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg.h')
0 files changed, 0 insertions, 0 deletions