summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dec_video.c2
-rw-r--r--libmpdemux/demux_real.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/dec_video.c b/dec_video.c
index 2963613563..ac2957787c 100644
--- a/dec_video.c
+++ b/dec_video.c
@@ -483,6 +483,8 @@ switch(sh_video->codec->driver){
lavc_context.width=sh_video->disp_w;
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);
+ if (sh_video->format == mmioFOURCC('R', 'V', '1', '3'))
+ lavc_context.sub_id = 3;
/* open it */
if (avcodec_open(&lavc_context, lavc_codec) < 0) {
mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantOpenCodec);
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index 5a8a6eadc1..013aac68e4 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -147,8 +147,8 @@ loop:
/* flags: */
/* 0x2 - keyframe */
- printf("packet#%d: len: %d, stream_id: %d, timestamp: %d, flags: %x\n",
- priv->num_of_packets, len, stream_id, timestamp, flags);
+// 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 -= 12;
@@ -352,6 +352,8 @@ void demux_open_real(demuxer_t* demuxer)
sh->samplerate = stream_read_word(demuxer->stream);
stream_skip(demuxer->stream, 4);
sh->channels = stream_read_word(demuxer->stream);
+ printf("samplerate: %d, channels: %d\n",
+ sh->samplerate, sh->channels);
/* Desc #1 */
skip_str(1, demuxer);
@@ -453,6 +455,7 @@ void demux_open_real(demuxer_t* demuxer)
case 0x10003001:
/* sub id: 3 */
/* codec id: rv10 */
+ sh->bih->biCompression = sh->format = mmioFOURCC('R', 'V', '1', '3');
break;
case 0x20001000:
case 0x20100001: