← Back to branch summary

~siretart/libav/merge.raring.libav-0.8.6

« back to all changes in this revision

Viewing changes to libavformat/ffmetadec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:30:00 UTC
  • mfrom: (1.4.1)
  • mto: (1.3.11 sid) (26.1.1 quantal-security)
  • mto: This revision was merged to the branch mainline in revision 15.
  • Revision ID: package-import@ubuntu.com-20120112223000-s1reiy1e28hnix42
Tags: upstream-0.8~beta2
Import upstream version 0.8~beta2

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/ffmetadec.c
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
20
 */
21
21
 
 
22
#include "libavutil/mathematics.h"
22
23
#include "avformat.h"
23
24
#include "ffmeta.h"
24
25
#include "internal.h"
74
75
        end = AV_NOPTS_VALUE;
75
76
    }
76
77
 
77
 
    return ff_new_chapter(s, s->nb_chapters, tb, start, end, NULL);
 
78
    return avpriv_new_chapter(s, s->nb_chapters, tb, start, end, NULL);
78
79
}
79
80
 
80
81
static uint8_t *unescape(uint8_t *buf, int size)
131
132
        get_line(s->pb, line, sizeof(line));
132
133
 
133
134
        if (!memcmp(line, ID_STREAM, strlen(ID_STREAM))) {
134
 
            AVStream *st = av_new_stream(s, 0);
 
135
            AVStream *st = avformat_new_stream(s, NULL);
135
136
 
136
137
            if (!st)
137
138
                return -1;