← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ffmpeg/libavformat/adtsenc.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/adtsenc.c
1
1
/*
2
2
 * ADTS muxer.
3
3
 * Copyright (c) 2006 Baptiste Coudurier <baptiste.coudurier@smartjog.com>
4
 
 *                    Mans Rullgard <mru@inprovide.com>
 
4
 *                    Mans Rullgard <mans@mansr.com>
5
5
 *
6
6
 * This file is part of FFmpeg.
7
7
 *
84
84
    put_bits(&pb, 2, 0);        /* number_of_raw_data_blocks_in_frame */
85
85
 
86
86
    flush_put_bits(&pb);
87
 
    put_buffer(&s->pb, buf, ADTS_HEADER_SIZE);
88
 
 
89
 
    return 0;
90
 
}
91
 
 
92
 
static int adts_write_trailer(AVFormatContext *s)
93
 
{
 
87
    put_buffer(s->pb, buf, ADTS_HEADER_SIZE);
 
88
 
94
89
    return 0;
95
90
}
96
91
 
97
92
static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
98
93
{
99
94
    ADTSContext *adts = s->priv_data;
100
 
    ByteIOContext *pb = &s->pb;
 
95
    ByteIOContext *pb = s->pb;
101
96
 
102
97
    if (!pkt->size)
103
98
        return 0;
119
114
    CODEC_ID_NONE,
120
115
    adts_write_header,
121
116
    adts_write_packet,
122
 
    adts_write_trailer,
123
117
};