avfilter/af_adelay: make per channel delay argument an int64_t

[ffmpeg] / libavcodec / options.c

diff --git a/libavcodec/options.c b/libavcodec/options.c
index 61689b48d94e561cf703f7cbd8ef4b05a06342af..b8d4a9faf614a8fa7350a07c024becc5e7104235 100644 (file)
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -39,7 +39,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
 static const char* context_to_name(void* ptr) {
     AVCodecContext *avc= ptr;
 
-    if(avc && avc->codec && avc->codec->name)
+    if (avc && avc->codec)
         return avc->codec->name;
     else
         return "NULL";
@@ -140,12 +140,9 @@ 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);
-            }
-        }
+        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);