[FFmpeg-cvslog] brstm: fix use of uninitialized variables

James Almer git at videolan.org
Wed Jun 24 19:33:30 CEST 2015


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Jun 24 14:16:41 2015 -0300| [58d7dde081d1aef2cfa79c3675c54023371d1060] | committer: James Almer

brstm: fix use of uninitialized variables

Fixes valgrind complaining about "Conditional jump or move depends on uninitialised value(s)"

Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavformat/brstm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/brstm.c b/libavformat/brstm.c
index 1d190c9..b6108e3 100644
--- a/libavformat/brstm.c
+++ b/libavformat/brstm.c
@@ -327,7 +327,7 @@ static int read_header(AVFormatContext *s)
 
             b->data_start = avio_tell(s->pb);
 
-            if ((major != 1 || minor) && !bfstm)
+            if (!bfstm && (major != 1 || minor))
                 avpriv_request_sample(s, "Version %d.%d", major, minor);
 
             return 0;



More information about the ffmpeg-cvslog mailing list