ffmpeg | branch: release/1.2 | Michael Niedermayer <michae...@gmx.at> | Tue Jan 6 19:51:38 2015 +0100| [529488afa3155593af4e19a97c3085f535ab7506] | committer: Michael Niedermayer
avformat/mov: Fix mixed declaration and statement warning Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit db27f50e0658e91758e8a17fdcf390e6bc93c1d2) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=529488afa3155593af4e19a97c3085f535ab7506 --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 3dea13a..1820ce8 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -281,10 +281,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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
