[Mplayer-cvslog] CVS: main/libmpdemux demux_rawdv.c,1.1,1.2 demuxer.c,1.116,1.117

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv21148

Modified Files:
	demux_rawdv.c demuxer.c 
Log Message:
This just corrects a function name to match the other demuxer's
"xxx_check_file" convention, adds a verbose note about (to match the other
demuxers)
patch by Kees Cook <mplayer at outflux.net>


Index: demux_rawdv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rawdv.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demux_rawdv.c	5 Aug 2002 17:21:35 -0000	1.1
+++ demux_rawdv.c	4 Oct 2002 19:23:36 -0000	1.2
@@ -59,12 +59,15 @@
    frames->current_filepos=newpos*frames->frame_size;
 }
 
-int check_file_rawdv(demuxer_t *demuxer)
+int rawdv_check_file(demuxer_t *demuxer)
 {
    unsigned char tmp_buffer[DV_PAL_FRAME_SIZE];
    int bytes_read=0;
    int result=0;
    dv_decoder_t *td;
+
+   mp_msg(MSGT_DEMUX,MSGL_V,"Checking for DV\n");
+
    stream_reset(demuxer->stream);
    stream_seek(demuxer->stream, 0);
    bytes_read=stream_read(demuxer->stream,tmp_buffer,DV_PAL_FRAME_SIZE);
@@ -105,7 +108,7 @@
    dp_video->pos=frames->current_filepos;
    dp_video->flags=0;
 
-   if (demuxer->audio)
+   if (demuxer->audio && demuxer->audio->id!=-2)
 	{
       demux_packet_t* dp_audio=clone_demux_packet(dp_video);
       ds_add_packet(demuxer->audio,dp_audio);

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- demuxer.c	29 Sep 2002 19:26:40 -0000	1.116
+++ demuxer.c	4 Oct 2002 19:23:36 -0000	1.117
@@ -516,7 +516,7 @@
 int demux_open_roq(demuxer_t* demuxer);
 #ifdef HAVE_LIBDV095
 int demux_open_rawdv(demuxer_t* demuxer);
-extern int check_file_rawdv(demuxer_t *demuxer);
+extern int rawdv_check_file(demuxer_t *demuxer);
 #endif
 
 extern int vivo_check_file(demuxer_t *demuxer);
@@ -831,7 +831,7 @@
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_RAWDV)
 {
    demuxer=new_demuxer(stream,DEMUXER_TYPE_RAWDV,audio_id,video_id,dvdsub_id);
-   if(check_file_rawdv(demuxer))
+   if(rawdv_check_file(demuxer))
    {
       mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"RAWDV");
       file_format=DEMUXER_TYPE_RAWDV;