diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-11-29 04:56:40 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-11-29 17:15:57 +0100 |
| commit | cc7d5cfeec949cf01b2ebe198de1758f483f0376 (patch) | |
| tree | 48a272129d7cf894be70a48d0047f19fac7db71b /libavformat/img2.c | |
| parent | c1fcf563b13051f280db169ba41c6a1b21b25e08 (diff) | |
img2: K&R formatting cosmetics
Also introduce local img_ namespace to simplify debugging.
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 81 |
1 files changed, 41 insertions, 40 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 14bb3d08cf..6ee8f8170e 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -29,50 +29,51 @@ typedef struct { } IdStrMap; static const IdStrMap img_tags[] = { - { AV_CODEC_ID_MJPEG , "jpeg"}, - { AV_CODEC_ID_MJPEG , "jpg"}, - { AV_CODEC_ID_LJPEG , "ljpg"}, - { AV_CODEC_ID_PNG , "png"}, - { 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_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_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 , "sunras"}, - { AV_CODEC_ID_JPEG2000 , "jp2"}, - { AV_CODEC_ID_JPEG2000 , "jpc"}, - { AV_CODEC_ID_DPX , "dpx"}, - { AV_CODEC_ID_PICTOR , "pic"}, - { AV_CODEC_ID_XBM , "xbm"}, - { AV_CODEC_ID_XWD , "xwd"}, - { AV_CODEC_ID_NONE , NULL} + { AV_CODEC_ID_MJPEG, "jpeg" }, + { AV_CODEC_ID_MJPEG, "jpg" }, + { AV_CODEC_ID_LJPEG, "ljpg" }, + { AV_CODEC_ID_PNG, "png" }, + { 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_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_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, "sunras" }, + { AV_CODEC_ID_JPEG2000, "jp2" }, + { AV_CODEC_ID_JPEG2000, "jpc" }, + { AV_CODEC_ID_DPX, "dpx" }, + { AV_CODEC_ID_PICTOR, "pic" }, + { AV_CODEC_ID_XBM, "xbm" }, + { 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) { |