diff options
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 14bb3d08cf..ed4b39afe0 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -3,20 +3,20 @@ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard * Copyright (c) 2004 Michael Niedermayer * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -31,8 +31,11 @@ typedef struct { static const IdStrMap img_tags[] = { { AV_CODEC_ID_MJPEG , "jpeg"}, { AV_CODEC_ID_MJPEG , "jpg"}, + { AV_CODEC_ID_MJPEG , "jps"}, { 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"}, { AV_CODEC_ID_PPM , "ppm"}, { AV_CODEC_ID_PPM , "pnm"}, @@ -45,6 +48,7 @@ static const IdStrMap img_tags[] = { { AV_CODEC_ID_MPEG4 , "mpg4-img"}, { AV_CODEC_ID_FFV1 , "ffv1-img"}, { AV_CODEC_ID_RAWVIDEO , "y"}, + { AV_CODEC_ID_RAWVIDEO , "raw"}, { AV_CODEC_ID_BMP , "bmp"}, { AV_CODEC_ID_GIF , "gif"}, { AV_CODEC_ID_TARGA , "tga"}, @@ -59,11 +63,16 @@ static const IdStrMap img_tags[] = { { AV_CODEC_ID_SUNRAST , "im1"}, { AV_CODEC_ID_SUNRAST , "im8"}, { AV_CODEC_ID_SUNRAST , "im24"}, + { AV_CODEC_ID_SUNRAST , "im32"}, { AV_CODEC_ID_SUNRAST , "sunras"}, + { AV_CODEC_ID_JPEG2000 , "j2c"}, + { AV_CODEC_ID_JPEG2000 , "j2k"}, { AV_CODEC_ID_JPEG2000 , "jp2"}, { AV_CODEC_ID_JPEG2000 , "jpc"}, { AV_CODEC_ID_DPX , "dpx"}, + { AV_CODEC_ID_EXR , "exr"}, { AV_CODEC_ID_PICTOR , "pic"}, + { AV_CODEC_ID_V210X , "yuv10"}, { AV_CODEC_ID_XBM , "xbm"}, { AV_CODEC_ID_XWD , "xwd"}, { AV_CODEC_ID_NONE , NULL} |