[FFmpeg-cvslog] sol: return error if av_get_packet() fails.

Justin Ruggles git at videolan.org
Mon Mar 19 05:30:23 CET 2012


ffmpeg | branch: release/0.8 | Justin Ruggles <justin.ruggles at gmail.com> | Fri Sep 23 21:43:43 2011 -0400| [ce80957cf10e2ddbdbe6f74912c69228a8efaf35] | committer: Reinhard Tartler

sol: return error if av_get_packet() fails.

This prevents sending a packet with data=NULL size=AVERROR_EOF.
(cherry picked from commit b15a9888a8f8e8cc9784ffd8d5d0307900fb78bb)

Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

 libavformat/sol.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavformat/sol.c b/libavformat/sol.c
index 1ebb4d2..83e85c8 100644
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -132,6 +132,8 @@ static int sol_read_packet(AVFormatContext *s,
     if (s->pb->eof_reached)
         return AVERROR(EIO);
     ret= av_get_packet(s->pb, pkt, MAX_SIZE);
+    if (ret < 0)
+        return ret;
     pkt->stream_index = 0;
 
     /* note: we need to modify the packet size here to handle the last



More information about the ffmpeg-cvslog mailing list