← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xvidcap/jaunty-proposed

« back to all changes in this revision

Viewing changes to ffmpeg/libavformat/mpjpeg.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc, Andrew Starr-Bochicchio, Lionel Le Folgoc
  • Date: 2008-12-26 00:10:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20081226001006-2040ls9680bd1blt
Tags: 1.1.7-0.2ubuntu1
https://launchpad.net/bugs/298547
https://launchpad.net/bugs/311412
[ Andrew Starr-Bochicchio ]
* Merge from debian-multimedia (LP: #298547), Ubuntu Changes:
 - For ffmpeg-related build-deps, fix versionized dependencies
   as the ubuntu versioning is different than debian-multimedia's.

[ Lionel Le Folgoc ]
* LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision.
* debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API
  change (cherry-pick from Gentoo #234383).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavformat/mpjpeg.c
29
29
    uint8_t buf1[256];
30
30
 
31
31
    snprintf(buf1, sizeof(buf1), "--%s\n", BOUNDARY_TAG);
32
 
    put_buffer(&s->pb, buf1, strlen(buf1));
33
 
    put_flush_packet(&s->pb);
 
32
    put_buffer(s->pb, buf1, strlen(buf1));
 
33
    put_flush_packet(s->pb);
34
34
    return 0;
35
35
}
36
36
 
39
39
    uint8_t buf1[256];
40
40
 
41
41
    snprintf(buf1, sizeof(buf1), "Content-type: image/jpeg\n\n");
42
 
    put_buffer(&s->pb, buf1, strlen(buf1));
43
 
    put_buffer(&s->pb, pkt->data, pkt->size);
 
42
    put_buffer(s->pb, buf1, strlen(buf1));
 
43
    put_buffer(s->pb, pkt->data, pkt->size);
44
44
 
45
45
    snprintf(buf1, sizeof(buf1), "\n--%s\n", BOUNDARY_TAG);
46
 
    put_buffer(&s->pb, buf1, strlen(buf1));
47
 
    put_flush_packet(&s->pb);
 
46
    put_buffer(s->pb, buf1, strlen(buf1));
 
47
    put_flush_packet(s->pb);
48
48
    return 0;
49
49
}
50
50