lavf/mxfenc: better error handling with invalid frame rate.

[ffmpeg] / libavformat / img2.c

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 47dbb621d15ecf587bb6917f8b436cef25cb2943..ed4b39afe0d8f0613e7e2a8068b7721258e02d24 100644 (file)
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -24,63 +24,64 @@
 #include "internal.h"
 
 typedef struct {
-    enum CodecID id;
+    enum AVCodecID id;
     const char *str;
 } IdStrMap;
 
 static const IdStrMap img_tags[] = {
-    { CODEC_ID_MJPEG     , "jpeg"},
-    { CODEC_ID_MJPEG     , "jpg"},
-    { CODEC_ID_MJPEG     , "jps"},
-    { CODEC_ID_LJPEG     , "ljpg"},
-    { CODEC_ID_JPEGLS    , "jls"},
-    { CODEC_ID_PNG       , "png"},
-    { CODEC_ID_PNG       , "pns"},
-    { CODEC_ID_PNG       , "mng"},
-    { CODEC_ID_PPM       , "ppm"},
-    { CODEC_ID_PPM       , "pnm"},
-    { CODEC_ID_PGM       , "pgm"},
-    { CODEC_ID_PGMYUV    , "pgmyuv"},
-    { CODEC_ID_PBM       , "pbm"},
-    { CODEC_ID_PAM       , "pam"},
-    { CODEC_ID_MPEG1VIDEO, "mpg1-img"},
-    { CODEC_ID_MPEG2VIDEO, "mpg2-img"},
-    { CODEC_ID_MPEG4     , "mpg4-img"},
-    { CODEC_ID_FFV1      , "ffv1-img"},
-    { CODEC_ID_RAWVIDEO  , "y"},
-    { CODEC_ID_RAWVIDEO  , "raw"},
-    { CODEC_ID_BMP       , "bmp"},
-    { CODEC_ID_GIF       , "gif"},
-    { CODEC_ID_TARGA     , "tga"},
-    { CODEC_ID_TIFF      , "tiff"},
-    { CODEC_ID_TIFF      , "tif"},
-    { CODEC_ID_SGI       , "sgi"},
-    { CODEC_ID_PTX       , "ptx"},
-    { CODEC_ID_PCX       , "pcx"},
-    { CODEC_ID_SUNRAST   , "sun"},
-    { CODEC_ID_SUNRAST   , "ras"},
-    { CODEC_ID_SUNRAST   , "rs"},
-    { CODEC_ID_SUNRAST   , "im1"},
-    { CODEC_ID_SUNRAST   , "im8"},
-    { CODEC_ID_SUNRAST   , "im24"},
-    { CODEC_ID_SUNRAST   , "im32"},
-    { CODEC_ID_SUNRAST   , "sunras"},
-    { CODEC_ID_JPEG2000  , "j2c"},
-    { CODEC_ID_JPEG2000  , "j2k"},
-    { CODEC_ID_JPEG2000  , "jp2"},
-    { CODEC_ID_JPEG2000  , "jpc"},
-    { CODEC_ID_DPX       , "dpx"},
-    { CODEC_ID_EXR       , "exr"},
-    { CODEC_ID_PICTOR    , "pic"},
-    { CODEC_ID_XBM       , "xbm"},
-    { CODEC_ID_XWD       , "xwd"},
-    { 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_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_XWD       , "xwd"},
+    { AV_CODEC_ID_NONE      , NULL}
 };
 
-static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
+static enum AVCodecID av_str2id(const IdStrMap *tags, const char *str)
 {
     str= strrchr(str, '.');
-    if(!str) return CODEC_ID_NONE;
+    if(!str) return AV_CODEC_ID_NONE;
     str++;
 
     while (tags->id) {
@@ -89,10 +90,10 @@ static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
 
         tags++;
     }
-    return CODEC_ID_NONE;
+    return AV_CODEC_ID_NONE;
 }
 
-enum CodecID ff_guess_image2_codec(const char *filename)
+enum AVCodecID ff_guess_image2_codec(const char *filename)
 {
     return av_str2id(img_tags, filename);
 }