← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavformat/oggparseogm.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/oggparseogm.c
27
27
#include "libavcodec/get_bits.h"
28
28
#include "libavcodec/bytestream.h"
29
29
#include "avformat.h"
 
30
#include "internal.h"
30
31
#include "oggdec.h"
31
32
#include "riff.h"
32
33
 
81
82
            st->codec->height = bytestream_get_le32(&p);
82
83
            st->codec->time_base.den = spu * 10000000;
83
84
            st->codec->time_base.num = time_unit;
84
 
            av_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den);
 
85
            avpriv_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den);
85
86
        } else {
86
87
            st->codec->channels = bytestream_get_le16(&p);
87
88
            p += 2;                 /* block_align */
88
89
            st->codec->bit_rate = bytestream_get_le32(&p) * 8;
89
90
            st->codec->sample_rate = spu * 10000000 / time_unit;
90
 
            av_set_pts_info(st, 64, 1, st->codec->sample_rate);
 
91
            avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
91
92
        }
92
93
    } else if (*p == 3) {
93
94
        if (os->psize > 8)