← Back to branch summary

~siretart/libav/trusty

« back to all changes in this revision

Viewing changes to libavformat/ffmetadec.c

  • Committer: Reinhard Tartler
  • Date: 2013-10-23 03:04:17 UTC
  • mfrom: (1.3.36 sid)
  • Revision ID: siretart@tauware.de-20131023030417-1o6mpkl1l0raifjt
merge from debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/ffmetadec.c
123
123
    return 0;
124
124
}
125
125
 
126
 
static int read_header(AVFormatContext *s, AVFormatParameters *ap)
 
126
static int read_header(AVFormatContext *s)
127
127
{
128
128
    AVDictionary **m = &s->metadata;
129
129
    uint8_t line[1024];
138
138
                return -1;
139
139
 
140
140
            st->codec->codec_type = AVMEDIA_TYPE_DATA;
141
 
            st->codec->codec_id   = CODEC_ID_FFMETADATA;
 
141
            st->codec->codec_id   = AV_CODEC_ID_FFMETADATA;
142
142
 
143
143
            m = &st->metadata;
144
144
        } else if (!memcmp(line, ID_CHAPTER, strlen(ID_CHAPTER))) {
168
168
 
169
169
AVInputFormat ff_ffmetadata_demuxer = {
170
170
    .name        = "ffmetadata",
171
 
    .long_name   = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"),
 
171
    .long_name   = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text"),
172
172
    .read_probe  = probe,
173
173
    .read_header = read_header,
174
174
    .read_packet = read_packet,