diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 19:51:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-09 17:19:10 +0100 |
| commit | d0041dc8c4d79cf269650d0790956e0eeeb3dc31 (patch) | |
| tree | 30570457c8084cfa0072b6e9ac7fb7e79a226993 | |
| parent | b3c082412cdaa2a2c82dcca91a57e9cbf1f2a84d (diff) | |
| download | ffmpeg-d0041dc8c4d79cf269650d0790956e0eeeb3dc31.tar.gz | |
avformat/mov: Fix mixed declaration and statement warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit db27f50e0658e91758e8a17fdcf390e6bc93c1d2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 231367476c..7455e3b5e5 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); |