[SCM] libav/experimental: af_volume: preserve frame properties

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:01:38 UTC 2014


The following commit has been merged in the experimental branch:
commit 39c2880eeae6930b1036ce1f479afc1e1152c13f
Author: Anton Khirnov <anton at khirnov.net>
Date:   Wed Feb 19 20:55:27 2014 +0100

    af_volume: preserve frame properties

diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c
index 85d7067..12d496e 100644
--- a/libavfilter/af_volume.c
+++ b/libavfilter/af_volume.c
@@ -229,6 +229,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
     AVFilterLink *outlink = inlink->dst->outputs[0];
     int nb_samples        = buf->nb_samples;
     AVFrame *out_buf;
+    int ret;
 
     if (vol->volume == 1.0 || vol->volume_i == 256)
         return ff_filter_frame(outlink, buf);
@@ -240,7 +241,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
         out_buf = ff_get_audio_buffer(inlink, nb_samples);
         if (!out_buf)
             return AVERROR(ENOMEM);
-        out_buf->pts = buf->pts;
+        ret = av_frame_copy_props(out_buf, buf);
+        if (ret < 0) {
+            av_frame_free(&out_buf);
+            av_frame_free(&buf);
+            return ret;
+        }
     }
 
     if (vol->precision != PRECISION_FIXED || vol->volume_i > 0) {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list