virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'

Browse Source 
* commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a':
  img2: add stereo 3d still picture file extensions

Conflicts:
	libavformat/img2.c

See: 6fe12c7ff2094c68a8b6e9aeea7744ca15594091
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-12 19:48:36 +01:00
commit 2644df82e6
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/img2.c
View File

@ -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" },