From: Janne Grunau <janne-libav@jannau.net>
Date: Wed, 23 Nov 2011 23:18:33 +0000 (+0100)
Subject: avconv: fix segfault at EOF with delayed pictures
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=aa38cff2c6fdc1c0a7245f8a2aef5f6d4d2881d1;p=ffmpeg

avconv: fix segfault at EOF with delayed pictures

At EOF it makes no sense to modify avpkt.{data,size} in output_packet
since no data is consumed. Frame threading with more than 1 threads
hits the segfault.
---

diff --git a/avconv.c b/avconv.c
index be870a5273d..6f64bc80a44 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1892,8 +1892,11 @@ static int output_packet(InputStream *ist,
 
         if (ret < 0)
             return ret;
-        avpkt.data += ret;
-        avpkt.size -= ret;
+        // touch data and size only if not EOF
+        if (pkt) {
+            avpkt.data += ret;
+            avpkt.size -= ret;
+        }
         if (!got_output) {
             continue;
         }