RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-05-11 04:33:35 +00:00
Code Issues Releases Wiki Activity

fixed rv10 with subid=3

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3878 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2001-12-29 16:42:50 +00:00
parent 7d243ad740
commit 55324703aa
2 changed files with 7 additions and 2 deletions

2
dec_video.c
View File

@ -483,6 +483,8 @@ switch(sh_video->codec->driver){
lavc_context.width=sh_video->disp_w; lavc_context.width=sh_video->disp_w;
lavc_context.height=sh_video->disp_h; lavc_context.height=sh_video->disp_h;
mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",lavc_context.width,lavc_context.height); mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",lavc_context.width,lavc_context.height);
if (sh_video->format == mmioFOURCC('R', 'V', '1', '3'))
lavc_context.sub_id = 3;
/* open it */ /* open it */
if (avcodec_open(&lavc_context, lavc_codec) < 0) { if (avcodec_open(&lavc_context, lavc_codec) < 0) {
mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantOpenCodec); mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantOpenCodec);

7
libmpdemux/demux_real.c
View File

@ -147,8 +147,8 @@ loop:
/* flags: */ /* flags: */
/* 0x2 - keyframe */ /* 0x2 - keyframe */
printf("packet#%d: len: %d, stream_id: %d, timestamp: %d, flags: %x\n", // printf("packet#%d: len: %d, stream_id: %d, timestamp: %d, flags: %x\n",
priv->num_of_packets, len, stream_id, timestamp, flags); // priv->num_of_packets, len, stream_id, timestamp, flags);
priv->num_of_packets--; priv->num_of_packets--;
len -= 12; len -= 12;
@ -352,6 +352,8 @@ void demux_open_real(demuxer_t* demuxer)
sh->samplerate = stream_read_word(demuxer->stream); sh->samplerate = stream_read_word(demuxer->stream);
stream_skip(demuxer->stream, 4); stream_skip(demuxer->stream, 4);
sh->channels = stream_read_word(demuxer->stream); sh->channels = stream_read_word(demuxer->stream);
printf("samplerate: %d, channels: %d\n",
sh->samplerate, sh->channels);
/* Desc #1 */ /* Desc #1 */
skip_str(1, demuxer); skip_str(1, demuxer);
@ -453,6 +455,7 @@ void demux_open_real(demuxer_t* demuxer)
case 0x10003001: case 0x10003001:
/* sub id: 3 */ /* sub id: 3 */
/* codec id: rv10 */ /* codec id: rv10 */
sh->bih->biCompression = sh->format = mmioFOURCC('R', 'V', '1', '3');
break; break;
case 0x20001000: case 0x20001000:
case 0x20100001: case 0x20100001: