← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gst-libav1.0/trusty-proposed

« back to all changes in this revision

Viewing changes to gst-libs/ext/libav/libavformat/lmlm4.c

  • Committer: Package Import Robot
  • Author(s): Sebastian Dröge
  • Date: 2013-09-24 17:07:00 UTC
  • mfrom: (1.1.17) (7.1.9 experimental)
  • Revision ID: package-import@ubuntu.com-20130924170700-4dg62s3pwl0pdakz
Tags: 1.2.0-1
* New upstream stable release:
  + debian/control:
    - Build depend on GStreamer and gst-plugins-base >= 1.2.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst-libs/ext/libav/libavformat/lmlm4.c
58
58
    return 0;
59
59
}
60
60
 
61
 
static int lmlm4_read_header(AVFormatContext *s, AVFormatParameters *ap) {
 
61
static int lmlm4_read_header(AVFormatContext *s) {
62
62
    AVStream *st;
63
63
 
64
64
    if (!(st = avformat_new_stream(s, NULL)))
65
65
        return AVERROR(ENOMEM);
66
66
    st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
67
 
    st->codec->codec_id   = CODEC_ID_MPEG4;
 
67
    st->codec->codec_id   = AV_CODEC_ID_MPEG4;
68
68
    st->need_parsing      = AVSTREAM_PARSE_HEADERS;
69
69
    avpriv_set_pts_info(st, 64, 1001, 30000);
70
70
 
71
71
    if (!(st = avformat_new_stream(s, NULL)))
72
72
        return AVERROR(ENOMEM);
73
73
    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
74
 
    st->codec->codec_id   = CODEC_ID_MP2;
 
74
    st->codec->codec_id   = AV_CODEC_ID_MP2;
75
75
    st->need_parsing      = AVSTREAM_PARSE_HEADERS;
76
76
 
77
77
    /* the parameters will be extracted from the compressed bitstream */
120
120
 
121
121
AVInputFormat ff_lmlm4_demuxer = {
122
122
    .name           = "lmlm4",
123
 
    .long_name      = NULL_IF_CONFIG_SMALL("lmlm4 raw format"),
 
123
    .long_name      = NULL_IF_CONFIG_SMALL("raw lmlm4"),
124
124
    .read_probe     = lmlm4_probe,
125
125
    .read_header    = lmlm4_read_header,
126
126
    .read_packet    = lmlm4_read_packet,