Merge commit '25c2a27c9ec0150210d75ee5ac8ed1bfa14c1a56'

[ffmpeg] / libavformat / mov_esds.c

diff --git a/libavformat/mov_esds.c b/libavformat/mov_esds.c
index 2ecf03742f119e430250ce891bd67fcacbce32f0..a444d969c65e4fa10b9b4013dbf50b54443c0dcf 100644 (file)
--- a/libavformat/mov_esds.c
+++ b/libavformat/mov_esds.c
@@ -23,7 +23,7 @@
 int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb)
 {
     AVStream *st;
-    int tag;
+    int tag, ret = 0;
 
     if (fc->nb_streams < 1)
         return 0;
@@ -38,6 +38,7 @@ int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb)
 
     ff_mp4_read_descr(fc, pb, &tag);
     if (tag == MP4DecConfigDescrTag)
-        ff_mp4_read_dec_config_descr(fc, st, pb);
-    return 0;
+        ret = ff_mp4_read_dec_config_descr(fc, st, pb);
+
+    return ret;
 }