[FFmpeg-cvslog] avformat/flvdec: remove duplicated line error

Clément Bœsch git at videolan.org
Thu Jan 1 22:09:32 CET 2015


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Jan  1 22:09:21 2015 +0100| [6a29499b95bb1e7ab11bc9dfcac22da5825bbc0f] | committer: Clément Bœsch

avformat/flvdec: remove duplicated line error

Fix typo regression since 5c37ffca59e7eb1b8768f237deb35a9936c1a0a5

Found-By: cousin_luigi

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

 libavformat/flvdec.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index c13c0e4..572268f 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -441,7 +441,6 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
             if (amf_parse_object(s, astream, vstream, str_val, max_pos,
                                  depth + 1) < 0)
                 return -1;
-        if (avio_r8(ioc) != AMF_END_OF_OBJECT)
         if (avio_r8(ioc) != AMF_END_OF_OBJECT) {
             av_log(s, AV_LOG_ERROR, "Missing AMF_END_OF_OBJECT in AMF_DATA_TYPE_MIXEDARRAY\n");
             return -1;



More information about the ffmpeg-cvslog mailing list