diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-27 17:25:41 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-27 17:25:41 +0000 |
commit | a33158d60d04f21ee10881ccc5cd295e1aae5bca (patch) | |
tree | 021a6f021ecf99a2deebe6d17cb1574dc97673a5 /libmpdemux/demux_ogg.c | |
parent | e2c173be10fa87ef6df3049d80fcca80a2d1a174 (diff) | |
download | mpv-a33158d60d04f21ee10881ccc5cd295e1aae5bca.tar.bz2 mpv-a33158d60d04f21ee10881ccc5cd295e1aae5bca.tar.xz |
Convert printfs in aviprint.c to mp_msg and give the information printing
functions in this file a verbosity_level parameter.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17978 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ogg.c')
-rw-r--r-- | libmpdemux/demux_ogg.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 76f97b41f0..0e686a8419 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -705,8 +705,8 @@ void demux_ogg_scan_stream(demuxer_t* demuxer) { } -extern void print_wave_header(WAVEFORMATEX *h); -extern void print_video_header(BITMAPINFOHEADER *h); +extern void print_wave_header(WAVEFORMATEX *h, int verbose_level); +extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level); /** \brief Return the number of subtitle tracks in the file. @@ -993,7 +993,7 @@ int demux_ogg_open(demuxer_t* demuxer) { (int)inf.version_minor, (int)inf.version_subminor, n_video - 1); - if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_v->bih); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_v->bih,MSGL_V); } # endif /* HAVE_OGGTHEORA */ # ifdef HAVE_FLAC @@ -1036,7 +1036,7 @@ int demux_ogg_open(demuxer_t* demuxer) { n_video++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: video (FOURCC %c%c%c%c), -vid %d\n", ogg_d->num_sub,pack.packet[68],pack.packet[69],pack.packet[70],pack.packet[71],n_video-1); - if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_v->bih); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_v->bih,MSGL_V); // Old audio header } else if(get_uint32(pack.packet+96) == 0x05589F81) { unsigned int extra_size; @@ -1060,7 +1060,7 @@ int demux_ogg_open(demuxer_t* demuxer) { ogg_d->subs[ogg_d->num_sub].id = n_audio; n_audio++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (format 0x%04x), -aid %d\n",ogg_d->num_sub,sh_a->format,n_audio-1); - if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_a->wf); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_a->wf,MSGL_V); } else mp_msg(MSGT_DEMUX,MSGL_WARN,"Ogg stream %d contains an old header but the header type is unknown\n",ogg_d->num_sub); @@ -1092,7 +1092,7 @@ int demux_ogg_open(demuxer_t* demuxer) { n_video++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: video (FOURCC %c%c%c%c), -vid %d\n", ogg_d->num_sub,st->subtype[0],st->subtype[1],st->subtype[2],st->subtype[3],n_video-1); - if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_v->bih); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_v->bih,MSGL_V); /// New audio header } else if(strncmp(st->streamtype,"audio",5) == 0) { char buffer[5]; @@ -1131,7 +1131,7 @@ int demux_ogg_open(demuxer_t* demuxer) { ogg_d->subs[ogg_d->num_sub].id = n_audio; n_audio++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (format 0x%04x), -aid %d\n",ogg_d->num_sub,sh_a->format,n_audio-1); - if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_a->wf); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_a->wf,MSGL_V); /// Check for text (subtitles) header } else if (strncmp(st->streamtype, "text", 4) == 0) { @@ -1162,7 +1162,7 @@ int demux_ogg_open(demuxer_t* demuxer) { // If the audio stream is not defined we took the first one if(demuxer->audio->id == -1) { demuxer->audio->id = n_audio - 1; -// if(sh_a->wf) print_wave_header(sh_a->wf); +// if(sh_a->wf) print_wave_header(sh_a->wf,MSGL_INFO); } /// Is it the stream we want if(demuxer->audio->id == (n_audio - 1)) { @@ -1176,7 +1176,7 @@ int demux_ogg_open(demuxer_t* demuxer) { /// Also for video if(demuxer->video->id == -1) { demuxer->video->id = n_video - 1; -// if(sh_v->bih) print_video_header(sh_v->bih); +// if(sh_v->bih) print_video_header(sh_v->bih,MSGL_INFO); } if(demuxer->video->id == (n_video - 1)) { demuxer->video->sh = sh_v; |