mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-03-02 10:41:16 +00:00
Add graceful error handling to avcodec_get_pix_fmt_name() and avcodec_get_pix_fmt().
Originally committed as revision 14513 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
a79db0f7c4
commit
42a45a03e7
@ -390,7 +390,7 @@ void avcodec_get_chroma_sub_sample(int pix_fmt, int *h_shift, int *v_shift)
|
|||||||
const char *avcodec_get_pix_fmt_name(int pix_fmt)
|
const char *avcodec_get_pix_fmt_name(int pix_fmt)
|
||||||
{
|
{
|
||||||
if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB)
|
if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB)
|
||||||
return "???";
|
return NULL;
|
||||||
else
|
else
|
||||||
return pix_fmt_info[pix_fmt].name;
|
return pix_fmt_info[pix_fmt].name;
|
||||||
}
|
}
|
||||||
@ -401,8 +401,8 @@ enum PixelFormat avcodec_get_pix_fmt(const char* name)
|
|||||||
|
|
||||||
for (i=0; i < PIX_FMT_NB; i++)
|
for (i=0; i < PIX_FMT_NB; i++)
|
||||||
if (!strcmp(pix_fmt_info[i].name, name))
|
if (!strcmp(pix_fmt_info[i].name, name))
|
||||||
break;
|
|
||||||
return i;
|
return i;
|
||||||
|
return PIX_FMT_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void avcodec_pix_fmt_string (char *buf, int buf_size, int pix_fmt)
|
void avcodec_pix_fmt_string (char *buf, int buf_size, int pix_fmt)
|
||||||
|
Loading…
Reference in New Issue
Block a user