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

ffv1: change w/h asserts to check as the condition can likely happen

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-06 03:12:25 +02:00
parent 5709e20199
commit 856834a77f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ffv1.c
View File

@ -700,6 +700,9 @@ static void write_header(FFV1Context *f){
static av_cold int common_init(AVCodecContext *avctx){
FFV1Context *s = avctx->priv_data;
if(!avctx->width || !avctx->height)
return AVERROR_INVALIDDATA;
s->avctx= avctx;
s->flags= avctx->flags;
@ -710,7 +713,6 @@ static av_cold int common_init(AVCodecContext *avctx){
s->width = avctx->width;
s->height= avctx->height;
assert(s->width && s->height);
//defaults
s->num_h_slices=1;
s->num_v_slices=1;