← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ffmpeg-debian/utopic

« back to all changes in this revision

Viewing changes to libavcodec/shorten.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-01-20 09:20:53 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090120092053-izz63p40hc98qfgp
Tags: 3:0.svn20090119-1ubuntu1
https://launchpad.net/bugs/318501
https://launchpad.net/bugs/253767
* merge from debian. LP: #318501
* new version fixes CVE-2008-3230, LP: #253767

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/shorten.c
305
305
    {
306
306
        int maxnlpc = 0;
307
307
        /* shorten signature */
308
 
        if (get_bits_long(&s->gb, 32) != bswap_32(ff_get_fourcc("ajkg"))) {
 
308
        if (get_bits_long(&s->gb, 32) != bswap_32(AV_RL32("ajkg"))) {
309
309
            av_log(s->avctx, AV_LOG_ERROR, "missing shorten magic 'ajkg'\n");
310
310
            return -1;
311
311
        }