diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2003-08-12 19:44:35 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2003-08-12 19:44:35 +0000 |
| commit | 419c810ef7897006b42a71448f82765a8633ebbe (patch) | |
| tree | d6b43c18edc63725d720f7c8ecf2fbccb7bbb353 /src | |
| parent | 2d139c2d9b8ee0e2c043fc188e4bfcd0328e59a5 (diff) | |
| download | xine-lib-419c810ef7897006b42a71448f82765a8633ebbe.tar.gz xine-lib-419c810ef7897006b42a71448f82765a8633ebbe.tar.bz2 | |
whoops, header contains pixel, not frame aspect ratio
CVS patchset: 5284
CVS date: 2003/08/12 19:44:35
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_yuv4mpeg2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index b98f5eb8d..18344cac4 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -24,7 +24,7 @@ * tools, visit: * http://mjpeg.sourceforge.net/ * - * $Id: demux_yuv4mpeg2.c,v 1.26 2003/08/12 18:41:08 jstembridge Exp $ + * $Id: demux_yuv4mpeg2.c,v 1.27 2003/08/12 19:44:35 jstembridge Exp $ */ #ifdef HAVE_CONFIG_H @@ -151,7 +151,7 @@ static int open_yuv4mpeg2_file(demux_yuv4mpeg2_t *this) { /* read frame rate - stored as a ratio * numberator */ this->fps_n = strtol(header_ptr + 1, &header_endptr, 10); - if ((header_end_ptr == header_ptr + 1) || (*header_endptr != ':')) + if ((header_endptr == header_ptr + 1) || (*header_endptr != ':')) return 0; else header_ptr = header_endptr; @@ -314,8 +314,8 @@ static void demux_yuv4mpeg2_send_headers(demux_plugin_t *this_gen) { buf->decoder_info[0] = this->progressive; buf->decoder_info[1] = this->frame_pts_inc; /* initial video step */ buf->decoder_info[2] = this->top_field_first; - buf->decoder_info[3] = this->aspect_n; - buf->decoder_info[4] = this->aspect_d; + buf->decoder_info[3] = this->bih.biWidth*this->aspect_n/this->aspect_d; + buf->decoder_info[4] = this->bih.biHeight; memcpy(buf->content, &this->bih, sizeof(this->bih)); buf->size = sizeof(this->bih); buf->type = BUF_VIDEO_I420; |