diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 19:48:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 19:48:36 +0100 |
| commit | 2644df82e6b3610eaf374352ed981bc5d48d2762 (patch) | |
| tree | 8cf17a27c511d1b40fab4b227dce021b10e5d227 /libavformat/img2.c | |
| parent | 30aa9b727da05d9bf3346ffabdbc983bd5f37616 (diff) | |
| parent | ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a (diff) | |
Merge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'
* commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a':
img2: add stereo 3d still picture file extensions
Conflicts:
libavformat/img2.c
See: 6fe12c7ff2094c68a8b6e9aeea7744ca15594091
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 7539359540..4fd4fd2285 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -32,6 +32,7 @@ static const IdStrMap img_tags[] = { { AV_CODEC_ID_MJPEG, "jpeg" }, { AV_CODEC_ID_MJPEG, "jpg" }, { AV_CODEC_ID_MJPEG, "jps" }, + { AV_CODEC_ID_MJPEG, "mpo" }, { AV_CODEC_ID_LJPEG, "ljpg" }, { AV_CODEC_ID_JPEGLS, "jls" }, { AV_CODEC_ID_PNG, "png" }, |