← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/mjpega_dump_header_bsf.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/mjpega_dump_header_bsf.c
35
35
                              const uint8_t *buf, int buf_size, int keyframe)
36
36
{
37
37
    uint8_t *poutbufp;
 
38
    unsigned dqt = 0, dht = 0, sof0 = 0;
38
39
    int i;
39
40
 
40
41
    if (avctx->codec_id != CODEC_ID_MJPEG) {
59
60
    for (i = 0; i < buf_size - 1; i++) {
60
61
        if (buf[i] == 0xff) {
61
62
            switch (buf[i + 1]) {
62
 
            case DQT:  /* quant off */
63
 
            case DHT:  /* huff  off */
64
 
            case SOF0: /* image off */
65
 
                bytestream_put_be32(&poutbufp, i + 46);
66
 
                break;
 
63
            case DQT:  dqt  = i + 46; break;
 
64
            case DHT:  dht  = i + 46; break;
 
65
            case SOF0: sof0 = i + 46; break;
67
66
            case SOS:
 
67
                bytestream_put_be32(&poutbufp, dqt); /* quant off */
 
68
                bytestream_put_be32(&poutbufp, dht); /* huff off */
 
69
                bytestream_put_be32(&poutbufp, sof0); /* image off */
68
70
                bytestream_put_be32(&poutbufp, i + 46); /* scan off */
69
71
                bytestream_put_be32(&poutbufp, i + 46 + AV_RB16(buf + i + 2)); /* data off */
70
72
                bytestream_put_buffer(&poutbufp, buf + 2, buf_size - 2); /* skip already written SOI */
71
73
                *poutbuf_size = poutbufp - *poutbuf;
72
74
                return 1;
73
75
            case APP1:
74
 
                if (i + 8 < buf_size && AV_RL32(buf + i + 8) == ff_get_fourcc("mjpg")) {
 
76
                if (i + 8 < buf_size && AV_RL32(buf + i + 8) == AV_RL32("mjpg")) {
75
77
                    av_log(avctx, AV_LOG_ERROR, "bitstream already formatted\n");
76
78
                    memcpy(*poutbuf, buf, buf_size);
77
79
                    *poutbuf_size = buf_size;