[FFmpeg-cvslog] mov: only print multiple edit lists warning for actually unsupported cases

Michael Niedermayer git at videolan.org
Sat Sep 29 18:57:07 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 29 18:44:35 2012 +0200| [3ceeb01c06d3f59cb2050052b840e48a6445f7e0] | committer: Michael Niedermayer

mov: only print multiple edit lists warning for actually unsupported cases

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

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

 libavformat/mov.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 26fb414..2899cfc 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2624,6 +2624,7 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 {
     MOVStreamContext *sc;
     int i, edit_count, version, edit_start_index = 0;
+    int unsupported = 0;
 
     if (c->fc->nb_streams < 1)
         return 0;
@@ -2652,9 +2653,11 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
             edit_start_index = 1;
         } else if (i == edit_start_index && time >= 0)
             sc->start_time = time;
+        else
+            unsupported = 1;
     }
 
-    if (edit_count > 1)
+    if (unsupported)
         av_log(c->fc, AV_LOG_WARNING, "multiple edit list entries, "
                "a/v desync might occur, patch welcome\n");
 



More information about the ffmpeg-cvslog mailing list