← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavformat/xwma.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/xwma.c
22
22
#include <inttypes.h>
23
23
 
24
24
#include "avformat.h"
 
25
#include "internal.h"
25
26
#include "riff.h"
26
27
 
27
28
/*
69
70
    if (tag != MKTAG('f', 'm', 't', ' '))
70
71
        return -1;
71
72
    size = avio_rl32(pb);
72
 
    st = av_new_stream(s, 0);
 
73
    st = avformat_new_stream(s, NULL);
73
74
    if (!st)
74
75
        return AVERROR(ENOMEM);
75
76
 
115
116
    }
116
117
 
117
118
    /* set the sample rate */
118
 
    av_set_pts_info(st, 64, 1, st->codec->sample_rate);
 
119
    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
119
120
 
120
121
    /* parse the remaining RIFF chunks */
121
122
    for (;;) {
252
253
}
253
254
 
254
255
AVInputFormat ff_xwma_demuxer = {
255
 
    "xwma",
256
 
    NULL_IF_CONFIG_SMALL("Microsoft xWMA"),
257
 
    sizeof(XWMAContext),
258
 
    xwma_probe,
259
 
    xwma_read_header,
260
 
    xwma_read_packet,
 
256
    .name           = "xwma",
 
257
    .long_name      = NULL_IF_CONFIG_SMALL("Microsoft xWMA"),
 
258
    .priv_data_size = sizeof(XWMAContext),
 
259
    .read_probe     = xwma_probe,
 
260
    .read_header    = xwma_read_header,
 
261
    .read_packet    = xwma_read_packet,
261
262
};