[FFmpeg-cvslog] avformat/avidec: skip len=0 entries from the index

[Don Moir]

ffmpeg | branch: master | Don Moir <donmoir at comcast.net> | Fri Apr 25 17:57:49 2014 +0200| [62056d09b13cd95f03dd8a3d282df5f666f40b01] | committer: Michael Niedermayer

avformat/avidec: skip len=0 entries from the index

Reduces cpu & memory requirements for the index
See Ticket 3531

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 562a255..f5c4f0b 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -224,7 +224,7 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num)
 
             if (last_pos == pos || pos == base - 8)
                 avi->non_interleaved = 1;
-            if (last_pos != pos && (len || !ast->sample_size))
+            if (last_pos != pos && len)
                 av_add_index_entry(st, pos, ast->cum_len, len, 0,
                                    key ? AVINDEX_KEYFRAME : 0);
 
@@ -1226,7 +1226,7 @@ start_sync:
                 ast->packet_size  = size + 8;
                 ast->remaining    = size;
 
-                if (size || !ast->sample_size) {
+                if (size) {
                     uint64_t pos = avio_tell(pb) - 8;
                     if (!st->index_entries || !st->nb_index_entries ||
                         st->index_entries[st->nb_index_entries - 1].pos < pos) {