ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Thu Dec 3 01:39:47 2015 -0300| [9ac5beaa86b55a6121c30ffb3b75a9d923343c35] | committer: James Almer
avformat/mpjpegdec: fix mixed declarations and code > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ac5beaa86b55a6121c30ffb3b75a9d923343c35 --- libavformat/mpjpegdec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c index b644ee4..49fe6f6 100644 --- a/libavformat/mpjpegdec.c +++ b/libavformat/mpjpegdec.c @@ -39,10 +39,12 @@ typedef struct MPJPEGDemuxContext { static void trim_right(char *p) { + char *end; + if (!p || !*p) return; - char *end = p + strlen(p); + end = p + strlen(p); while (end > p && av_isspace(*(end-1))) *(--end) = '\0'; } @@ -330,8 +332,10 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket *pkt) while ((ret = av_append_packet(s->pb, pkt, read_chunk - remaining)) >= 0) { /* scan the new data */ + char *start; + len = ret + remaining; - char *start = pkt->data + pkt->size - len; + start = pkt->data + pkt->size - len; do { if (!memcmp(start, mpjpeg->searchstr, mpjpeg->searchstr_len)) { // got the boundary! rewind the stream _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
