diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-10 13:30:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-10 13:42:29 +0100 |
| commit | 0e4efad93c1defa12e8e2c103f7b92b91a7608dd (patch) | |
| tree | b0dca3867418fb4bb73647f30b5b0e860636d2c8 | |
| parent | 0103bc67fdd54f68c864de483e350014700b4740 (diff) | |
| download | ffmpeg-0e4efad93c1defa12e8e2c103f7b92b91a7608dd.tar.gz | |
avformat/flvdec: fix potential use of uninitialized variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0fadbd3623cf9132832f48810c0edb93aa63f51b)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/flvdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 17d1313d60..c64b3a9d92 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -459,11 +459,11 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, } if (key) { + acodec = astream ? astream->codec : NULL; + vcodec = vstream ? vstream->codec : NULL; + // stream info doesn't live any deeper than the first object if (depth == 1) { - acodec = astream ? astream->codec : NULL; - vcodec = vstream ? vstream->codec : NULL; - if (amf_type == AMF_DATA_TYPE_NUMBER || amf_type == AMF_DATA_TYPE_BOOL) { if (!strcmp(key, "duration")) |