← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavformat/vocdec.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:
libavformat/vocdec.c
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
20
 */
21
21
 
 
22
#include "libavutil/intreadwrite.h"
22
23
#include "voc.h"
23
24
 
24
25
 
38
39
 
39
40
static int voc_read_header(AVFormatContext *s, AVFormatParameters *ap)
40
41
{
41
 
    voc_dec_context_t *voc = s->priv_data;
 
42
    VocDecContext *voc = s->priv_data;
42
43
    ByteIOContext *pb = s->pb;
43
44
    int header_size;
44
45
    AVStream *st;
62
63
int
63
64
voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
64
65
{
65
 
    voc_dec_context_t *voc = s->priv_data;
 
66
    VocDecContext *voc = s->priv_data;
66
67
    AVCodecContext *dec = st->codec;
67
68
    ByteIOContext *pb = s->pb;
68
 
    voc_type_t type;
 
69
    VocType type;
69
70
    int size;
70
71
    int sample_rate = 0;
71
72
    int channels = 1;
137
138
AVInputFormat voc_demuxer = {
138
139
    "voc",
139
140
    NULL_IF_CONFIG_SMALL("Creative Voice file format"),
140
 
    sizeof(voc_dec_context_t),
 
141
    sizeof(VocDecContext),
141
142
    voc_probe,
142
143
    voc_read_header,
143
144
    voc_read_packet,