From 09ed8098ff66b2a606cdb6b92a97ca00d0ca04eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Mon, 7 Jan 2013 21:42:46 +0200
Subject: [PATCH] rtpdec_vp8: Make sure the previous packet is returned
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is a bug from c7d4de3d73 - if the previous frame wasn't
returned yet (due to missing the final packets), but we have
enough data of it to return the first partition, we write that into
pkt and set returned_old_frame. That commit forgot returning 0 for
the case where this current packet didn't have the end_packet flag
set.
Signed-off-by: Martin Storsjö <martin@martin.st>
---
libavformat/rtpdec_vp8.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/libavformat/rtpdec_vp8.c b/libavformat/rtpdec_vp8.c
index 6dbf402df6d..966f7b87342 100644
--- a/libavformat/rtpdec_vp8.c
+++ b/libavformat/rtpdec_vp8.c
@@ -233,12 +233,13 @@ static int vp8_handle_packet(AVFormatContext *ctx, PayloadContext *vp8,
vp8->prev_seq = seq;
avio_write(vp8->data, buf, len);
+ if (returned_old_frame) {
+ *timestamp = old_timestamp;
+ return end_packet ? 1 : 0;
+ }
+
if (end_packet) {
int ret;
- if (returned_old_frame) {
- *timestamp = old_timestamp;
- return 1;
- }
ret = ff_rtp_finalize_packet(pkt, &vp8->data, st->index);
if (ret < 0)
return ret;
--
GitLab