← Back to branch summary

~ubuntu-branches/debian/sid/ffmpeg/sid

« back to all changes in this revision

Viewing changes to libavformat/swfdec.c

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun, Fabian Greffrath, Andreas Cadhalpun
  • Date: 2015-09-22 15:15:20 UTC
  • mfrom: (0.1.29)
  • Revision ID: package-import@ubuntu.com-20150922151520-hhmd3in9ykigjvs9
Tags: 7:2.8-1
http://bugs.debian.org/786670
http://bugs.debian.org/798189
[ Fabian Greffrath ]
* Pass the --dbg-package=ffmpeg-dbg parameter only to dh_strip.
* Add alternative Depends: libavcodec-ffmpeg-extra56 to libavcodec-dev and
  ffmpeg-dbg to allow for building and debugging with this library installed.

[ Andreas Cadhalpun ]
* Import new major upstream release 2.8.
* Remove the transitional lib*-ffmpeg-dev packages.
* Drop old Breaks on kodi-bin.
* Drop workaround for sparc, which is no Debian architecture anymore.
* Re-enable x265 on alpha, as it's available again.
* Disable unavailable frei0r, opencv and x264 on mips64el.
* Disable libopenjpeg (#787275) and libschroedinger (#787957) decoders.
  (Closes: #786670)
* Disable libdc1394 on sparc64, because it links against the broken due to
  #790560 libudev1.
* Enable libsnappy support.
* Add new symbols.
* Update debian/copyright.
* Update debian/tests/encdec_list.txt.
* Add hls-only-seek-if-there-is-an-offset.patch. (Closes: #798189)
* Add 'Breaks: libavutil-ffmpeg54 (>= 8:0)' to the libraries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/swfdec.c
23
23
#include "libavutil/avassert.h"
24
24
#include "libavutil/channel_layout.h"
25
25
#include "libavutil/imgutils.h"
 
26
#include "libavutil/internal.h"
26
27
#include "libavutil/intreadwrite.h"
27
28
#include "libavcodec/get_bits.h"
28
29
#include "swf.h"
67
68
        && AV_RB24(p->buf) != AV_RB24("FWS"))
68
69
        return 0;
69
70
 
70
 
    init_get_bits8(&gb, p->buf + 3, p->buf_size - 3);
 
71
    if (   AV_RB24(p->buf) == AV_RB24("CWS")
 
72
        && p->buf[3] <= 20)
 
73
        return AVPROBE_SCORE_MAX / 4 + 1;
 
74
 
 
75
    if (init_get_bits8(&gb, p->buf + 3, p->buf_size - 3) < 0)
 
76
        return 0;
71
77
 
72
78
    skip_bits(&gb, 40);
73
79
    len = get_bits(&gb, 5);
338
344
 
339
345
            out_len = colormapsize * colormapbpp + linesize * height;
340
346
 
341
 
            av_dlog(s, "bitmap: ch=%d fmt=%d %dx%d (linesize=%d) len=%d->%ld pal=%d\n",
 
347
            ff_dlog(s, "bitmap: ch=%d fmt=%d %dx%d (linesize=%d) len=%d->%ld pal=%d\n",
342
348
                    ch_id, bmp_fmt, width, height, linesize, len, out_len, colormapsize);
343
349
 
344
350
            zbuf = av_malloc(len);
407
413
            }
408
414
            if (st->codec->pix_fmt != AV_PIX_FMT_NONE && st->codec->pix_fmt != pix_fmt) {
409
415
                av_log(s, AV_LOG_ERROR, "pixel format change unsupported\n");
410
 
            }else
 
416
            } else
411
417
                st->codec->pix_fmt = pix_fmt;
412
418
 
413
419
            if (linesize * height > pkt->size) {