Mercurial > mplayer.hg

comparison libmpdemux/demux_nuv.c @ 16859:d3b47567e629

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
big-endian fixes for "extended" (i.e. mythtv) files.
author reimar
date Tue, 25 Oct 2005 20:01:09 +0000
parents 6b86089c2edd
children 67c30d47ffd4
comparison
equal deleted inserted replaced
16858:daf4e680d116 16859:d3b47567e629
235 235
236 for (i = 0; i < 2; ++i) { 236 for (i = 0; i < 2; ++i) {
237 if (stream_read(demuxer->stream, (char*)&rtjpeg_frameheader, 237 if (stream_read(demuxer->stream, (char*)&rtjpeg_frameheader,
238 sizeof(rtjpeg_frameheader)) < sizeof(rtjpeg_frameheader)) 238 sizeof(rtjpeg_frameheader)) < sizeof(rtjpeg_frameheader))
239 goto out; 239 goto out;
240 le2me_rtframeheader(&rtjpeg_frameheader);
240 241
241 if (rtjpeg_frameheader.frametype != 'X') 242 if (rtjpeg_frameheader.frametype != 'X')
242 stream_skip(demuxer->stream, rtjpeg_frameheader.packetlength); 243 stream_skip(demuxer->stream, rtjpeg_frameheader.packetlength);
243 } 244 }
244 245
248 if (rtjpeg_frameheader.packetlength != sizeof(ext)) { 249 if (rtjpeg_frameheader.packetlength != sizeof(ext)) {
249 mp_msg(MSGT_DEMUXER, MSGL_WARN, 250 mp_msg(MSGT_DEMUXER, MSGL_WARN,
250 "NUV extended frame does not have expected length, ignoring\n"); 251 "NUV extended frame does not have expected length, ignoring\n");
251 goto out; 252 goto out;
252 } 253 }
253 le2me_extendeddata(&ext);
254 254
255 if (stream_read(demuxer->stream, (char*)&ext, sizeof(ext)) < sizeof(ext)) 255 if (stream_read(demuxer->stream, (char*)&ext, sizeof(ext)) < sizeof(ext))
256 goto out; 256 goto out;
257 le2me_extendeddata(&ext);
257 258
258 if (ext.version != 1) { 259 if (ext.version != 1) {
259 mp_msg(MSGT_DEMUXER, MSGL_WARN, 260 mp_msg(MSGT_DEMUXER, MSGL_WARN,
260 "NUV extended frame has unknown version number (%d), ignoring\n", 261 "NUV extended frame has unknown version number (%d), ignoring\n",
261 ext.version); 262 ext.version);