Mercurial > mplayer.hg

comparison libmpdemux/demux_y4m.c @ 9654:ee7203b48e7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix crash on streams with frame tags, patch by Brett Kosinski <brettk@frodo.dyn.gno.org>
author alex
date Sat, 22 Mar 2003 19:50:10 +0000
parents 8a357300d0ec
children 74968e3440ff
comparison
equal deleted inserted replaced
9653:d82ee11f70f5 9654:ee7203b48e7c
32 32
33 stream_read(demuxer->stream, buf, 9); 33 stream_read(demuxer->stream, buf, 9);
34 buf[9] = 0; 34 buf[9] = 0;
35 35
36 if (strncmp("YUV4MPEG2", buf, 9) && strncmp("YUV4MPEG ", buf, 9)) { 36 if (strncmp("YUV4MPEG2", buf, 9) && strncmp("YUV4MPEG ", buf, 9)) {
37 mp_msg(MSGT_DEMUX, MSGL_DBG2, "Failed: YUV4MPEG2\n");
38 return 0; 37 return 0;
39 } 38 }
40 39
41 demuxer->priv = malloc(sizeof(y4m_priv_t)); 40 demuxer->priv = malloc(sizeof(y4m_priv_t));
42 priv = demuxer->priv; 41 priv = demuxer->priv;
65 demux_packet_t *dp; 64 demux_packet_t *dp;
66 y4m_priv_t *priv=demux->priv; 65 y4m_priv_t *priv=demux->priv;
67 y4m_frame_info_t fi; 66 y4m_frame_info_t fi;
68 unsigned char *buf[3]; 67 unsigned char *buf[3];
69 int err, size; 68 int err, size;
69
70 y4m_init_frame_info(&fi);
70 71
71 demux->filepos=stream_tell(demux->stream); 72 demux->filepos=stream_tell(demux->stream);
72 73
73 size = ((sh_video_t*)ds->sh)->disp_w*((sh_video_t*)ds->sh)->disp_h; 74 size = ((sh_video_t*)ds->sh)->disp_w*((sh_video_t*)ds->sh)->disp_h;
74 75