mirror of https://git.ffmpeg.org/ffmpeg.git
- Segfault fixed when liba52 dynamic library isn't found.
Originally committed as revision 449 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
bc6caae212
commit
fffcb5e841
4
ffmpeg.c
4
ffmpeg.c
|
@ -1490,7 +1490,9 @@ int find_codec_parameters(AVFormatContext *ic)
|
||||||
ret = -1;
|
ret = -1;
|
||||||
goto the_end;
|
goto the_end;
|
||||||
}
|
}
|
||||||
avcodec_open(&st->codec, codec);
|
ret = avcodec_open(&st->codec, codec);
|
||||||
|
if (ret < 0)
|
||||||
|
goto the_end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pktl = av_mallocz(sizeof(AVPacketList));
|
pktl = av_mallocz(sizeof(AVPacketList));
|
||||||
|
|
|
@ -80,7 +80,7 @@ static int a52_decode_init(AVCodecContext *avctx)
|
||||||
s->handle = dlopen(liba52name, RTLD_LAZY);
|
s->handle = dlopen(liba52name, RTLD_LAZY);
|
||||||
if (!s->handle)
|
if (!s->handle)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "A52 library %s could not be opened: %s\n", liba52name, dlerror());
|
fprintf(stderr, "A52 library %s could not be opened! \n%s\n", liba52name, dlerror());
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
s->a52_init = (a52_state_t* (*)(uint32_t)) dlsymm(s->handle, "a52_init");
|
s->a52_init = (a52_state_t* (*)(uint32_t)) dlsymm(s->handle, "a52_init");
|
||||||
|
|
Loading…
Reference in New Issue