Mercurial > mplayer.hg

comparison mencoder.c @ 12016:b962aaad2940

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rawvideo muxer patch by John Earl <jwe21@cam.ac.uk>
author ranma
date Tue, 09 Mar 2004 14:46:34 +0000
parents 9134c957116a
children 846ed866f86c
comparison
equal deleted inserted replaced
12015:d99a02f51a70 12016:b962aaad2940
525 sh_video->fps=force_fps; 525 sh_video->fps=force_fps;
526 sh_video->frametime=1.0f/sh_video->fps; 526 sh_video->frametime=1.0f/sh_video->fps;
527 mp_msg(MSGT_MENCODER,MSGL_INFO,"input fps will be interpreted as %5.2f instead\n", sh_video->fps); 527 mp_msg(MSGT_MENCODER,MSGL_INFO,"input fps will be interpreted as %5.2f instead\n", sh_video->fps);
528 } 528 }
529 529
530 if(sh_audio && out_file_format==MUXER_TYPE_RAWVIDEO){
531 mp_msg(MSGT_MENCODER,MSGL_ERR,"Output file format RAWVIDEO does not support audio - disabling audio\n");
532 sh_audio=NULL;
533 }
530 if(sh_audio && out_audio_codec<0){ 534 if(sh_audio && out_audio_codec<0){
531 if(audio_id==-2) 535 if(audio_id==-2)
532 mp_msg(MSGT_MENCODER,MSGL_ERR,"This demuxer doesn't support -nosound yet.\n"); 536 mp_msg(MSGT_MENCODER,MSGL_ERR,"This demuxer doesn't support -nosound yet.\n");
533 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_NoAudioEncoderSelected); 537 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_NoAudioEncoderSelected);
534 mencoder_exit(1,NULL); 538 mencoder_exit(1,NULL);