diff options
| author | Michael Niedermayer <[email protected]> | 2015-05-12 12:16:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-05-12 12:17:59 +0200 |
| commit | 2ce2462ba8575ce16363064aecfc9fe2f4396bba (patch) | |
| tree | 6a238fbfb1884febd180c53a9ab71e9ddda9706a /libavformat/rtpenc_jpeg.c | |
| parent | 85bbe1dbd1cc2e72ea30958af9115b727e958b99 (diff) | |
| parent | da5c6a97bbfe34d4b30a89e72150dd400299ddce (diff) | |
Merge commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce'
* commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce':
riff: Add MultiScope II fourcc MSC2 as MJPEG
See: e31cdb5cc8080e164c66838a69f37f60f2d0ea82
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/rtpenc_jpeg.c')
0 files changed, 0 insertions, 0 deletions