From 655254f0017d423fe74b945bdfb7296c990dec32 Mon Sep 17 00:00:00 2001
From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Sun, 14 Jan 2007 01:20:24 +0000
Subject: simplify

Originally committed as revision 7457 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/swf.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'libavformat/swf.c')

diff --git a/libavformat/swf.c b/libavformat/swf.c
index 149406daa8..f8b7c2675d 100644
--- a/libavformat/swf.c
+++ b/libavformat/swf.c
@@ -855,17 +855,17 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
             return AVERROR_IO;
         if (tag == TAG_VIDEOFRAME) {
             int ch_id = get_le16(pb);
+            len -= 2;
             for( i=0; i<s->nb_streams; i++ ) {
                 st = s->streams[i];
                 if (st->codec->codec_type == CODEC_TYPE_VIDEO && st->id == ch_id) {
                     frame = get_le16(pb);
-                    av_get_packet(pb, pkt, len-4);
+                    av_get_packet(pb, pkt, len-2);
                     pkt->pts = frame * swf->ms_per_frame;
                     pkt->stream_index = st->index;
                     return pkt->size;
                 }
             }
-            url_fskip(pb, len-2);
         } else if (tag == TAG_STREAMBLOCK) {
             st = s->streams[swf->audio_stream_index];
             if (st->codec->codec_id == CODEC_ID_MP3) {
@@ -874,10 +874,8 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
                 pkt->stream_index = st->index;
                 return pkt->size;
             }
-            url_fskip(pb, len);
-        } else {
-            url_fskip(pb, len);
         }
+        url_fskip(pb, len);
     }
     return 0;
 }
-- 
cgit v1.2.3