← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavformat/xa.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavformat/xa.c
29
29
 
30
30
#include "libavutil/intreadwrite.h"
31
31
#include "avformat.h"
 
32
#include "internal.h"
32
33
 
33
34
#define XA00_TAG MKTAG('X', 'A', 0, 0)
34
35
#define XAI0_TAG MKTAG('X', 'A', 'I', 0)
70
71
    AVStream *st;
71
72
 
72
73
    /*Set up the XA Audio Decoder*/
73
 
    st = av_new_stream(s, 0);
 
74
    st = avformat_new_stream(s, NULL);
74
75
    if (!st)
75
76
        return AVERROR(ENOMEM);
76
77
 
86
87
    st->codec->block_align  = avio_rl16(pb);
87
88
    st->codec->bits_per_coded_sample = avio_rl16(pb);
88
89
 
89
 
    av_set_pts_info(st, 64, 1, st->codec->sample_rate);
 
90
    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
90
91
 
91
92
    return 0;
92
93
}
119
120
}
120
121
 
121
122
AVInputFormat ff_xa_demuxer = {
122
 
    "xa",
123
 
    NULL_IF_CONFIG_SMALL("Maxis XA File Format"),
124
 
    sizeof(MaxisXADemuxContext),
125
 
    xa_probe,
126
 
    xa_read_header,
127
 
    xa_read_packet,
 
123
    .name           = "xa",
 
124
    .long_name      = NULL_IF_CONFIG_SMALL("Maxis XA File Format"),
 
125
    .priv_data_size = sizeof(MaxisXADemuxContext),
 
126
    .read_probe     = xa_probe,
 
127
    .read_header    = xa_read_header,
 
128
    .read_packet    = xa_read_packet,
128
129
};