Mercurial > mplayer.hg

comparison libmpdemux/demux_nut.c @ 32123:a86413775fbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace sizeof(BITMAPINFOHEADER)
author reimar
date Sun, 12 Sep 2010 16:08:57 +0000
parents d332ea379205
children 139f2b064ef9
comparison
equal deleted inserted replaced
32122:0f9662ec84d0 32123:a86413775fbe
145 demuxer->audio->sh= demuxer->a_streams[i]; 145 demuxer->audio->sh= demuxer->a_streams[i];
146 break; 146 break;
147 } 147 }
148 case NUT_VIDEO_CLASS: { 148 case NUT_VIDEO_CLASS: {
149 BITMAPINFOHEADER * bih = 149 BITMAPINFOHEADER * bih =
150 calloc(sizeof(BITMAPINFOHEADER) + 150 calloc(sizeof(*bih) +
151 s[i].codec_specific_len, 1); 151 s[i].codec_specific_len, 1);
152 sh_video_t * sh_video = new_sh_video(demuxer, i); 152 sh_video_t * sh_video = new_sh_video(demuxer, i);
153 int j; 153 int j;
154 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "nut", i); 154 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "nut", i);
155 155
169 if (!s[i].sample_height) sh_video->aspect = 0; 169 if (!s[i].sample_height) sh_video->aspect = 0;
170 else sh_video->aspect = 170 else sh_video->aspect =
171 s[i].sample_width / (float)s[i].sample_height; 171 s[i].sample_width / (float)s[i].sample_height;
172 sh_video->i_bps = 0; // FIXME 172 sh_video->i_bps = 0; // FIXME
173 173
174 bih->biSize = sizeof(BITMAPINFOHEADER) + 174 bih->biSize = sizeof(*bih) +
175 s[i].codec_specific_len; 175 s[i].codec_specific_len;
176 bih->biWidth = s[i].width; 176 bih->biWidth = s[i].width;
177 bih->biHeight = s[i].height; 177 bih->biHeight = s[i].height;
178 bih->biBitCount = 0; // FIXME 178 bih->biBitCount = 0; // FIXME
179 bih->biSizeImage = 0; // FIXME 179 bih->biSizeImage = 0; // FIXME