diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 14:49:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 14:49:13 +0100 |
| commit | db29a7c7c2822a2f2e9804988e279a9fe7d88c11 (patch) | |
| tree | 04fb612effd1e808baf292466197027e8b68b924 /libavformat/img2.c | |
| parent | 8119d8b01f8391f11c447802782e9017ad419d99 (diff) | |
| parent | 9d46eaec7a90bd8f5cd9e45398c6d17804182320 (diff) | |
| download | ffmpeg-db29a7c7c2822a2f2e9804988e279a9fe7d88c11.tar.gz | |
Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320'
* commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320':
build: The FLAC encoder also depends on the flacdsp code
img2: K&R formatting cosmetics
h264: check context state before decoding slice data partitions
flashsv: make sure data for zlib priming is available
Conflicts:
libavcodec/Makefile
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 103 |
1 files changed, 52 insertions, 51 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 2176acde09..eee100a57c 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -29,61 +29,62 @@ typedef struct { } IdStrMap; 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"}, - { AV_CODEC_ID_PGM , "pgm"}, - { AV_CODEC_ID_PGMYUV , "pgmyuv"}, - { AV_CODEC_ID_PBM , "pbm"}, - { AV_CODEC_ID_PAM , "pam"}, - { AV_CODEC_ID_MPEG1VIDEO, "mpg1-img"}, - { AV_CODEC_ID_MPEG2VIDEO, "mpg2-img"}, - { 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"}, - { AV_CODEC_ID_TIFF , "tiff"}, - { AV_CODEC_ID_TIFF , "tif"}, - { AV_CODEC_ID_SGI , "sgi"}, - { AV_CODEC_ID_PTX , "ptx"}, - { AV_CODEC_ID_PCX , "pcx"}, - { AV_CODEC_ID_BRENDER_PIX, "pix"}, - { AV_CODEC_ID_SUNRAST , "sun"}, - { AV_CODEC_ID_SUNRAST , "ras"}, - { AV_CODEC_ID_SUNRAST , "rs"}, - { 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_XFACE , "xface"}, - { AV_CODEC_ID_XWD , "xwd"}, - { AV_CODEC_ID_NONE , NULL} + { 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" }, + { AV_CODEC_ID_PGM, "pgm" }, + { AV_CODEC_ID_PGMYUV, "pgmyuv" }, + { AV_CODEC_ID_PBM, "pbm" }, + { AV_CODEC_ID_PAM, "pam" }, + { AV_CODEC_ID_MPEG1VIDEO, "mpg1-img" }, + { AV_CODEC_ID_MPEG2VIDEO, "mpg2-img" }, + { 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" }, + { AV_CODEC_ID_TIFF, "tiff" }, + { AV_CODEC_ID_TIFF, "tif" }, + { AV_CODEC_ID_SGI, "sgi" }, + { AV_CODEC_ID_PTX, "ptx" }, + { AV_CODEC_ID_PCX, "pcx" }, + { AV_CODEC_ID_BRENDER_PIX, "pix" }, + { AV_CODEC_ID_SUNRAST, "sun" }, + { AV_CODEC_ID_SUNRAST, "ras" }, + { AV_CODEC_ID_SUNRAST, "rs" }, + { 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_XFACE, "xface" }, + { AV_CODEC_ID_XWD, "xwd" }, + { AV_CODEC_ID_NONE, NULL } }; static enum AVCodecID av_str2id(const IdStrMap *tags, const char *str) { - str= strrchr(str, '.'); - if(!str) return AV_CODEC_ID_NONE; + str = strrchr(str, '.'); + if (!str) + return AV_CODEC_ID_NONE; str++; while (tags->id) { |