← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ffmpeg/lucid-security

« back to all changes in this revision

Viewing changes to libavformat/r3d.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-03-13 09:18:28 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090313091828-n4ktby5eca487uhv
Tags: 3:0.svn20090303-1ubuntu1+unstripped1
merge from ubuntu.jaunty branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/r3d.c
51
51
static int r3d_read_red1(AVFormatContext *s)
52
52
{
53
53
    AVStream *st = av_new_stream(s, 0);
 
54
    char filename[258];
54
55
    int tmp, tmp2;
55
56
 
56
57
    if (!st)
92
93
        av_set_pts_info(ast, 32, 1, st->time_base.den);
93
94
    }
94
95
 
95
 
    st->filename = av_mallocz(258);
96
 
    if (!st->filename)
97
 
        return AVERROR(ENOMEM);
98
 
    get_buffer(s->pb, st->filename, 257);
 
96
    get_buffer(s->pb, filename, 257);
 
97
    filename[sizeof(filename)-1] = 0;
 
98
    av_metadata_set(&st->metadata, "filename", filename);
99
99
 
100
 
    dprintf(s, "filename %s\n", st->filename);
 
100
    dprintf(s, "filename %s\n", filename);
101
101
    dprintf(s, "resolution %dx%d\n", st->codec->width, st->codec->height);
102
102
    dprintf(s, "timescale %d\n", st->time_base.den);
103
103
    dprintf(s, "frame rate %d/%d\n",