X-Git-Url: https://git.piment-noir.org/?p=deb_ffmpeg.git;a=blobdiff_plain;f=ffmpeg%2Flibavformat%2Fflvdec.c;fp=ffmpeg%2Flibavformat%2Fflvdec.c;h=c64b3a9d927c662a01fca9aeb8ceced80cf22f12;hp=17d1313d60860471f7ebc08d849607564ffd3fcd;hb=dcebb6f35d810c9009a455808b016c790bb633b4;hpb=f6fa7814ccfe3e76514b36cf04f5cd3cb657c8cf diff --git a/ffmpeg/libavformat/flvdec.c b/ffmpeg/libavformat/flvdec.c index 17d1313..c64b3a9 100644 --- a/ffmpeg/libavformat/flvdec.c +++ b/ffmpeg/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"))