[FFmpeg-cvslog] mpegts: always reset pes packet state on new packet

Marton Balint git at videolan.org
Tue May 6 15:47:38 CEST 2014


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Fri May  2 17:17:01 2014 +0200| [6c5375100c4fdb2f9b1a397b9969e580b2c4fdb0] | committer: Marton Balint

mpegts: always reset pes packet state on new packet

Fixes ticket #3584.

Signed-off-by: Marton Balint <cus at passwd.hu>

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

 libavformat/mpegts.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 7ed7bb4..0a5ac68 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -918,9 +918,10 @@ static int mpegts_push_data(MpegTSFilter *filter,
         if (pes->state == MPEGTS_PAYLOAD && pes->data_index > 0) {
             new_pes_packet(pes, ts->pkt);
             ts->stop_parse = 1;
+        } else {
+            reset_pes_packet_state(pes);
         }
         pes->state         = MPEGTS_HEADER;
-        pes->data_index    = 0;
         pes->ts_packet_pos = pos;
     }
     p = buf;



More information about the ffmpeg-cvslog mailing list