]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/options: Remove always-true check
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Tue, 16 Mar 2021 19:41:42 +0000 (20:41 +0100)
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Sat, 20 Mar 2021 01:45:17 +0000 (02:45 +0100)
Added in dc51a72ba45fbefb9f1c6c3ca5a5b2388d69b2da, yet even back then
the check was always true as the AVCodecContext has already been memset
to zero before that.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
libavcodec/options.c

index 61689b48d94e561cf703f7cbd8ef4b05a06342af..53f13dab370d6e01e5f198673c12d24115f92dd3 100644 (file)
@@ -140,12 +140,10 @@ static int init_context_defaults(AVCodecContext *s, const AVCodec *codec)
 
     s->reordered_opaque    = AV_NOPTS_VALUE;
     if(codec && codec->priv_data_size){
-        if(!s->priv_data){
             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);