summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_nuv.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-27 23:07:30 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-27 23:07:30 +0000
commitde3257508efd4c2dd494fa360825dd0ceda9e77c (patch)
tree0e3a0de2991b8c1d097f27bd4e6c265a5634db01 /libmpdemux/demux_nuv.c
parentb2b11bb2df5109220a887f90aa73511b8600c1c3 (diff)
downloadmpv-de3257508efd4c2dd494fa360825dd0ceda9e77c.tar.bz2
mpv-de3257508efd4c2dd494fa360825dd0ceda9e77c.tar.xz
audio is working
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3812 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_nuv.c')
-rw-r--r--libmpdemux/demux_nuv.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libmpdemux/demux_nuv.c b/libmpdemux/demux_nuv.c
index c80ab68ddb..527881b800 100644
--- a/libmpdemux/demux_nuv.c
+++ b/libmpdemux/demux_nuv.c
@@ -43,7 +43,9 @@ int demux_nuv_fill_buffer ( demuxer_t *demuxer )
return 0; /* EOF */
#if 0
- printf("NUV frame read: %c packetlength: %d orig: %d new: %d\n", rtjpeg_frameheader.frametype,rtjpeg_frameheader.packetlength, orig_pos, orig_pos+rtjpeg_frameheader.packetlength);
+ printf("NUV frame: frametype: %c, comptype: %c, packetlength: %d\n",
+ rtjpeg_frameheader.frametype, rtjpeg_frameheader.comptype,
+ rtjpeg_frameheader.packetlength);
#endif
/* Skip Seekpoint, Text and Sync for now */
@@ -117,14 +119,14 @@ demuxer_t* demux_open_nuv ( demuxer_t* demuxer )
sh_video->disp_w = rtjpeg_fileheader.width;
sh_video->disp_h = rtjpeg_fileheader.height;
-
- sh_video->aspect = rtjpeg_fileheader.aspect;
+
+ sh_video->aspect = (float)rtjpeg_fileheader.aspect;
/* Get the FPS */
sh_video->fps = rtjpeg_fileheader.fps;
sh_video->frametime = 1 / sh_video->fps;
-#if 0
+#if 1
if (rtjpeg_fileheader.audioblocks != 0)
{
sh_audio = new_sh_audio(demuxer, 0);