ffmpeg | branch: release/1.2 | Michael Niedermayer <michae...@gmx.at> | Sun Feb
1 19:36:13 2015 +0100| [ef3687998fb46d7d936bb6023f25c1dc324a4640] | committer:
Michael Niedermayer
avformat/smacker: Fix number suffix
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit 465f3705b1ef832fd6904750d018f81f9044f3ab)
Conflicts:
libavformat/smacker.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef3687998fb46d7d936bb6023f25c1dc324a4640
---
libavformat/smacker.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index 84481e2..17fa0af 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -309,7 +309,7 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket
*pkt)
uint8_t *tmpbuf;
size = avio_rl32(s->pb) - 4;
- if(size + 4L > frame_size)
+ if(size + 4LL > frame_size)
return AVERROR_INVALIDDATA;
frame_size -= size;
frame_size -= 4;
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
