generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avutil/opt: Check av_parse_video_rate()s return value

Browse Source 
Fixes CID1257008

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-12-07 02:57:39 +01:00
parent eb74839caa
commit ace9161655
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/opt.c
View File

@@ -1811,8 +1811,10 @@ int av_opt_is_set_to_default(void *obj, const AVOption *o)
return (w == *(int *)dst) && (h == *((int *)dst+1)); return (w == *(int *)dst) && (h == *((int *)dst+1));
case AV_OPT_TYPE_VIDEO_RATE: case AV_OPT_TYPE_VIDEO_RATE:
q = (AVRational){0, 0}; q = (AVRational){0, 0};
if (o->default_val.str) if (o->default_val.str) {
av_parse_video_rate(&q, o->default_val.str); if ((ret = av_parse_video_rate(&q, o->default_val.str)) < 0)
return ret;
}
return !av_cmp_q(*(AVRational*)dst, q); return !av_cmp_q(*(AVRational*)dst, q);
case AV_OPT_TYPE_COLOR: { case AV_OPT_TYPE_COLOR: {
uint8_t color[4] = {0, 0, 0, 0}; uint8_t color[4] = {0, 0, 0, 0};