[FFmpeg-cvslog] mpegts: only emit new packets if data buffer exists

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


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Fri May  2 01:44:19 2014 +0200| [9ba8debce9946b21c20791b0d234443f71e471a0] | committer: Marton Balint

mpegts: only emit new packets if data buffer exists

I don't think this can acutally happen in the current code, but better safe
than sorry.

Fixes Coverity CID 732217.

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

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

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

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 20bed02..001f93b 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1125,8 +1125,6 @@ skip:
                 }
                 memcpy(pes->buffer->data + pes->data_index, p, buf_size);
                 pes->data_index += buf_size;
-            }
-            buf_size = 0;
             /* emit complete packets with known packet size
              * decreases demuxer delay for infrequent packets like subtitles from
              * a couple of seconds to milliseconds for properly muxed files.
@@ -1137,6 +1135,8 @@ skip:
                 ts->stop_parse = 1;
                 new_pes_packet(pes, ts->pkt);
             }
+            }
+            buf_size = 0;
             break;
         case MPEGTS_SKIP:
             buf_size = 0;



More information about the ffmpeg-cvslog mailing list