Mercurial > mplayer.hg
comparison mencoder.c @ 17366:934380353fd6
massive attack: mp_msg printf format fixes
author | rathann |
---|---|
date | Thu, 12 Jan 2006 20:04:36 +0000 |
parents | 25fdd83982a4 |
children | fa17424b4c7b |
comparison
equal
deleted
inserted
replaced
17365:e2ca21ac42ce | 17366:934380353fd6 |
---|---|
948 mux_a->h.dwRate=mux_a->wf->nAvgBytesPerSec; | 948 mux_a->h.dwRate=mux_a->wf->nAvgBytesPerSec; |
949 } | 949 } |
950 mux_a->h.dwRate *= playback_speed; | 950 mux_a->h.dwRate *= playback_speed; |
951 mux_a->wf->nSamplesPerSec *= playback_speed; | 951 mux_a->wf->nSamplesPerSec *= playback_speed; |
952 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, | 952 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, |
953 mux_a->wf->wFormatTag, mux_a->wf->nChannels, (long)mux_a->wf->nSamplesPerSec, | 953 mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec, |
954 mux_a->wf->wBitsPerSample, (long)mux_a->wf->nAvgBytesPerSec, (long)mux_a->h.dwSampleSize); | 954 mux_a->wf->wBitsPerSample, mux_a->wf->nAvgBytesPerSec, mux_a->h.dwSampleSize); |
955 break; | 955 break; |
956 } | 956 } |
957 | 957 |
958 if (verbose>1) print_wave_header(mux_a->wf); | 958 if (verbose>1) print_wave_header(mux_a->wf); |
959 | 959 |
980 mencoder_exit(1,NULL); | 980 mencoder_exit(1,NULL); |
981 } | 981 } |
982 if (sh_audio && mux_a->codec == ACODEC_COPY) { | 982 if (sh_audio && mux_a->codec == ACODEC_COPY) { |
983 if (playback_speed != 1.0) mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_NoSpeedWithFrameCopy); | 983 if (playback_speed != 1.0) mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_NoSpeedWithFrameCopy); |
984 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, | 984 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, |
985 mux_a->wf->wFormatTag, mux_a->wf->nChannels, (long)mux_a->wf->nSamplesPerSec, | 985 mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec, |
986 mux_a->wf->wBitsPerSample, (long)mux_a->wf->nAvgBytesPerSec, (long)mux_a->h.dwSampleSize); | 986 mux_a->wf->wBitsPerSample, mux_a->wf->nAvgBytesPerSec, mux_a->h.dwSampleSize); |
987 if (sh_audio->wf) { | 987 if (sh_audio->wf) { |
988 if ((mux_a->wf->wFormatTag != sh_audio->wf->wFormatTag) || | 988 if ((mux_a->wf->wFormatTag != sh_audio->wf->wFormatTag) || |
989 (mux_a->wf->nChannels != sh_audio->wf->nChannels) || | 989 (mux_a->wf->nChannels != sh_audio->wf->nChannels) || |
990 (mux_a->wf->nSamplesPerSec != sh_audio->wf->nSamplesPerSec * playback_speed)) | 990 (mux_a->wf->nSamplesPerSec != sh_audio->wf->nSamplesPerSec * playback_speed)) |
991 { | 991 { |
992 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, | 992 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, |
993 sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, (long)(sh_audio->wf->nSamplesPerSec * playback_speed), | 993 sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, (int)(sh_audio->wf->nSamplesPerSec * playback_speed), |
994 sh_audio->wf->wBitsPerSample, (long)sh_audio->wf->nAvgBytesPerSec, 0L); | 994 sh_audio->wf->wBitsPerSample, sh_audio->wf->nAvgBytesPerSec, 0); |
995 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_AudioCopyFileMismatch); | 995 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_AudioCopyFileMismatch); |
996 mencoder_exit(1,NULL); | 996 mencoder_exit(1,NULL); |
997 } | 997 } |
998 } else { | 998 } else { |
999 if ((mux_a->wf->wFormatTag != sh_audio->format) || | 999 if ((mux_a->wf->wFormatTag != sh_audio->format) || |
1000 (mux_a->wf->nChannels != sh_audio->channels) || | 1000 (mux_a->wf->nChannels != sh_audio->channels) || |
1001 (mux_a->wf->nSamplesPerSec != sh_audio->samplerate * playback_speed)) | 1001 (mux_a->wf->nSamplesPerSec != sh_audio->samplerate * playback_speed)) |
1002 { | 1002 { |
1003 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, | 1003 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, |
1004 sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, (long)(sh_audio->wf->nSamplesPerSec * playback_speed), | 1004 sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, (int)(sh_audio->wf->nSamplesPerSec * playback_speed), |
1005 sh_audio->wf->wBitsPerSample, (long)sh_audio->wf->nAvgBytesPerSec, 0L); | 1005 sh_audio->wf->wBitsPerSample, sh_audio->wf->nAvgBytesPerSec, 0); |
1006 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_AudioCopyFileMismatch); | 1006 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_AudioCopyFileMismatch); |
1007 mencoder_exit(1,NULL); | 1007 mencoder_exit(1,NULL); |
1008 } | 1008 } |
1009 } | 1009 } |
1010 } else if (sh_audio) { | 1010 } else if (sh_audio) { |