Mercurial > libavcodec.hg
comparison imgconvert.c @ 7463:5515e19b9137 libavcodec
Add graceful error handling to avcodec_get_pix_fmt_name() and avcodec_get_pix_fmt().
author | pross |
---|---|
date | Sun, 03 Aug 2008 00:41:31 +0000 |
parents | cc2c5a21a0eb |
children | 635ed2559262 |
comparison
equal
deleted
inserted
replaced
7462:5cbf11f56c02 | 7463:5515e19b9137 |
---|---|
388 } | 388 } |
389 | 389 |
390 const char *avcodec_get_pix_fmt_name(int pix_fmt) | 390 const char *avcodec_get_pix_fmt_name(int pix_fmt) |
391 { | 391 { |
392 if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB) | 392 if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB) |
393 return "???"; | 393 return NULL; |
394 else | 394 else |
395 return pix_fmt_info[pix_fmt].name; | 395 return pix_fmt_info[pix_fmt].name; |
396 } | 396 } |
397 | 397 |
398 enum PixelFormat avcodec_get_pix_fmt(const char* name) | 398 enum PixelFormat avcodec_get_pix_fmt(const char* name) |
399 { | 399 { |
400 int i; | 400 int i; |
401 | 401 |
402 for (i=0; i < PIX_FMT_NB; i++) | 402 for (i=0; i < PIX_FMT_NB; i++) |
403 if (!strcmp(pix_fmt_info[i].name, name)) | 403 if (!strcmp(pix_fmt_info[i].name, name)) |
404 break; | 404 return i; |
405 return i; | 405 return PIX_FMT_NONE; |
406 } | 406 } |
407 | 407 |
408 void avcodec_pix_fmt_string (char *buf, int buf_size, int pix_fmt) | 408 void avcodec_pix_fmt_string (char *buf, int buf_size, int pix_fmt) |
409 { | 409 { |
410 /* print header */ | 410 /* print header */ |