[SCM] libav/experimental: support swink created files which have soi/eoi broken tags reversed

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:05:42 UTC 2013


The following commit has been merged in the experimental branch:
commit 1f794d69c0fc46670a39f13606ed58b31f95a1a1
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Aug 20 19:55:37 2007 +0000

    support swink created files which have soi/eoi broken tags reversed
    
    Originally committed as revision 10152 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/swf.c b/libavformat/swf.c
index 4f62240..1916d4a 100644
--- a/libavformat/swf.c
+++ b/libavformat/swf.c
@@ -734,8 +734,10 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
             get_le16(pb); /* BITMAP_ID */
             av_new_packet(pkt, len-2);
             get_buffer(pb, pkt->data, 4);
-            if (AV_RB32(pkt->data) == 0xffd8ffd9) {
+            if (AV_RB32(pkt->data) == 0xffd8ffd9 ||
+                AV_RB32(pkt->data) == 0xffd9ffd8) {
                 /* old SWF files containing SOI/EOI as data start */
+                /* files created by swink have reversed tag */
                 pkt->size -= 4;
                 get_buffer(pb, pkt->data, pkt->size);
             } else {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list