Merge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Dec 2013 18:48:36 +0000 (19:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Dec 2013 18:48:36 +0000 (19:48 +0100)
* commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a':
  img2: add stereo 3d still picture file extensions

Conflicts:
libavformat/img2.c

See: 6fe12c7ff2094c68a8b6e9aeea7744ca15594091
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/img2.c

@@@ -32,8 -32,8 +32,9 @@@ 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"      },
      { AV_CODEC_ID_PNG,        "pns"      },
      { AV_CODEC_ID_PNG,        "mng"      },