[FFmpeg-cvslog] avformat/avidec: match first index and first packet size=0 handling
Michael Niedermayer
git at videolan.org
Sat Aug 31 09:48:11 CEST 2013
ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 31 03:08:25 2013 +0200| [32cff0d3f096293189916ea438918bcca0445d50] | committer: Carl Eugen Hoyos
avformat/avidec: match first index and first packet size=0 handling
Fixes Ticket2861
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 227a0eb5a92409572f2cecde6137529b83e7d495)
Conflicts:
libavformat/avidec.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32cff0d3f096293189916ea438918bcca0445d50
---
libavformat/avidec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 6513f3f..4852e44 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1303,7 +1303,7 @@ static int avi_read_idx1(AVFormatContext *s, int size)
st = s->streams[index];
ast = st->priv_data;
- if(first_packet && first_packet_pos && len) {
+ if (first_packet && first_packet_pos) {
data_offset = first_packet_pos - pos;
first_packet = 0;
}
More information about the ffmpeg-cvslog
mailing list