Commit 2644df82 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'ae9d13f0'

* commit 'ae9d13f0':
  img2: add stereo 3d still picture file extensions

Conflicts:
	libavformat/img2.c

See: 6fe12c7fMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 30aa9b72 ae9d13f0
...@@ -32,6 +32,7 @@ static const IdStrMap img_tags[] = { ...@@ -32,6 +32,7 @@ static const IdStrMap img_tags[] = {
{ AV_CODEC_ID_MJPEG, "jpeg" }, { AV_CODEC_ID_MJPEG, "jpeg" },
{ AV_CODEC_ID_MJPEG, "jpg" }, { AV_CODEC_ID_MJPEG, "jpg" },
{ AV_CODEC_ID_MJPEG, "jps" }, { AV_CODEC_ID_MJPEG, "jps" },
{ AV_CODEC_ID_MJPEG, "mpo" },
{ AV_CODEC_ID_LJPEG, "ljpg" }, { AV_CODEC_ID_LJPEG, "ljpg" },
{ AV_CODEC_ID_JPEGLS, "jls" }, { AV_CODEC_ID_JPEGLS, "jls" },
{ AV_CODEC_ID_PNG, "png" }, { AV_CODEC_ID_PNG, "png" },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment