[FFmpeg-cvslog] avcodec/utils: fix AVPacket lifetime in seek_frame_generic

Hendrik Leppkes git at videolan.org
Sat Jan 2 09:31:08 CET 2016


ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Jan  1 20:23:37 2016 +0100| [b966a403dd80604bb7dbb9ee6ec331ade0e84953] | committer: Hendrik Leppkes

avcodec/utils: fix AVPacket lifetime in seek_frame_generic

Fixes ticket #5117

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b966a403dd80604bb7dbb9ee6ec331ade0e84953
---

 libavformat/utils.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 95acbf3..7606502 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2142,15 +2142,18 @@ static int seek_frame_generic(AVFormatContext *s, int stream_index,
             } while (read_status == AVERROR(EAGAIN));
             if (read_status < 0)
                 break;
-            av_packet_unref(&pkt);
             if (stream_index == pkt.stream_index && pkt.dts > timestamp) {
-                if (pkt.flags & AV_PKT_FLAG_KEY)
+                if (pkt.flags & AV_PKT_FLAG_KEY) {
+                    av_packet_unref(&pkt);
                     break;
+                }
                 if (nonkey++ > 1000 && st->codec->codec_id != AV_CODEC_ID_CDGRAPHICS) {
                     av_log(s, AV_LOG_ERROR,"seek_frame_generic failed as this stream seems to contain no keyframes after the target timestamp, %d non keyframes found\n", nonkey);
+                    av_packet_unref(&pkt);
                     break;
                 }
             }
+            av_packet_unref(&pkt);
         }
         index = av_index_search_timestamp(st, timestamp, flags);
     }



More information about the ffmpeg-cvslog mailing list