Message ID | 20210316203100.528950-6-andreas.rheinhardt@gmail.com |
---|---|
State | Accepted |
Commit | f21b47f38c2fe67fe218a5621aec24be45ca12a2 |
Headers | show |
Series | [FFmpeg-devel,1/6] avcodec/utils: Check earlier for codec id/type mismatch | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
andriy/PPC64_make | success | Make finished |
andriy/PPC64_make_fate | success | Make fate finished |
diff --git a/libavcodec/options.c b/libavcodec/options.c index 53f13dab37..58c7ce8d62 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -140,10 +140,9 @@ static int init_context_defaults(AVCodecContext *s, const AVCodec *codec) s->reordered_opaque = AV_NOPTS_VALUE; if(codec && codec->priv_data_size){ - s->priv_data= av_mallocz(codec->priv_data_size); - if (!s->priv_data) { - return AVERROR(ENOMEM); - } + s->priv_data = av_mallocz(codec->priv_data_size); + if (!s->priv_data) + return AVERROR(ENOMEM); if(codec->priv_class){ *(const AVClass**)s->priv_data = codec->priv_class; av_opt_set_defaults(s->priv_data);
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavcodec/options.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)