← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavformat/oggparseflac.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/oggparseflac.c
22
22
#include "libavcodec/get_bits.h"
23
23
#include "libavcodec/flac.h"
24
24
#include "avformat.h"
 
25
#include "internal.h"
25
26
#include "oggdec.h"
26
27
 
27
28
#define OGG_FLAC_METADATA_TYPE_STREAMINFO 0x7F
55
56
        if (get_bits_long(&gb, 32) != FLAC_STREAMINFO_SIZE)
56
57
            return -1;
57
58
 
58
 
        ff_flac_parse_streaminfo(st->codec, &si, streaminfo_start);
 
59
        avpriv_flac_parse_streaminfo(st->codec, &si, streaminfo_start);
59
60
 
60
61
        st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
61
62
        st->codec->codec_id = CODEC_ID_FLAC;
65
66
        memcpy(st->codec->extradata, streaminfo_start, FLAC_STREAMINFO_SIZE);
66
67
        st->codec->extradata_size = FLAC_STREAMINFO_SIZE;
67
68
 
68
 
        av_set_pts_info(st, 64, 1, st->codec->sample_rate);
 
69
        avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
69
70
    } else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
70
71
        ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 4, os->psize - 4);
71
72
    }