[FFmpeg-cvslog] avformat/mov: Fix mixed declaration and statement warning

Michael Niedermayer git at videolan.org
Fri Jan 9 17:32:17 CET 2015


ffmpeg | branch: release/2.5 | Michael Niedermayer <michaelni at gmx.at> | Tue Jan  6 19:51:38 2015 +0100| [d0041dc8c4d79cf269650d0790956e0eeeb3dc31] | committer: Michael Niedermayer

avformat/mov: Fix mixed declaration and statement warning

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit db27f50e0658e91758e8a17fdcf390e6bc93c1d2)

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

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

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2313674..7455e3b 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -210,10 +210,11 @@ static int mov_read_covr(MOVContext *c, AVIOContext *pb, int type, int len)
 static int mov_metadata_raw(MOVContext *c, AVIOContext *pb,
                             unsigned len, const char *key)
 {
+    char *value;
     // Check for overflow.
     if (len >= INT_MAX)
         return AVERROR(EINVAL);
-    char *value = av_malloc(len + 1);
+    value = av_malloc(len + 1);
     if (!value)
         return AVERROR(ENOMEM);
     avio_read(pb, value, len);



More information about the ffmpeg-cvslog mailing list