Mercurial > mplayer.hg

comparison mencoder.c @ 6581:896c062e85ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clean up warnings in mencoder.
author rfelker
date Thu, 27 Jun 2002 19:33:28 +0000
parents fce6f98eb72e
children bfc209bb3f48
comparison
equal deleted inserted replaced
6580:5059143aa020 6581:896c062e85ec
42 42
43 #include "libvo/video_out.h" 43 #include "libvo/video_out.h"
44 44
45 #include "libmpcodecs/dec_audio.h" 45 #include "libmpcodecs/dec_audio.h"
46 #include "libmpcodecs/dec_video.h" 46 #include "libmpcodecs/dec_video.h"
47 #include "libmpcodecs/vf.h"
47 48
48 #ifdef HAVE_MP3LAME 49 #ifdef HAVE_MP3LAME
50 #undef CDECL
49 #include <lame/lame.h> 51 #include <lame/lame.h>
50 #endif 52 #endif
51 53
52 #ifdef HAVE_LIBCSS 54 #ifdef HAVE_LIBCSS
53 #include "libmpdemux/dvdauth.h" 55 #include "libmpdemux/dvdauth.h"
594 break; 596 break;
595 default: 597 default:
596 598
597 switch(mux_v->codec){ 599 switch(mux_v->codec){
598 case VCODEC_DIVX4: 600 case VCODEC_DIVX4:
599 sh_video->vfilter=vf_open_encoder(NULL,"divx4",mux_v); break; 601 sh_video->vfilter=vf_open_encoder(NULL,"divx4",(char *)mux_v); break;
600 case VCODEC_LIBAVCODEC: 602 case VCODEC_LIBAVCODEC:
601 sh_video->vfilter=vf_open_encoder(NULL,"lavc",mux_v); break; 603 sh_video->vfilter=vf_open_encoder(NULL,"lavc",(char *)mux_v); break;
602 case VCODEC_RAWRGB: 604 case VCODEC_RAWRGB:
603 sh_video->vfilter=vf_open_encoder(NULL,"rawrgb",mux_v); break; 605 sh_video->vfilter=vf_open_encoder(NULL,"rawrgb",(char *)mux_v); break;
604 case VCODEC_VFW: 606 case VCODEC_VFW:
605 sh_video->vfilter=vf_open_encoder(NULL,"vfw",mux_v); break; 607 sh_video->vfilter=vf_open_encoder(NULL,"vfw",(char *)mux_v); break;
606 case VCODEC_LIBDV: 608 case VCODEC_LIBDV:
607 sh_video->vfilter=vf_open_encoder(NULL,"libdv",mux_v); break; 609 sh_video->vfilter=vf_open_encoder(NULL,"libdv",(char *)mux_v); break;
608 } 610 }
609 if(!mux_v->bih || !sh_video->vfilter){ 611 if(!mux_v->bih || !sh_video->vfilter){
610 mp_msg(MSGT_MENCODER,MSGL_FATAL,"Failed to open the encoder\n"); 612 mp_msg(MSGT_MENCODER,MSGL_FATAL,"Failed to open the encoder\n");
611 mencoder_exit(1,NULL); 613 mencoder_exit(1,NULL);
612 } 614 }
852 int len=dec_audio(sh_audio,tmp,2304); 854 int len=dec_audio(sh_audio,tmp,2304);
853 if(len<=0) break; // eof 855 if(len<=0) break; // eof
854 /* mono encoding, a bit tricky */ 856 /* mono encoding, a bit tricky */
855 if (mux_a->wf->nChannels == 1) 857 if (mux_a->wf->nChannels == 1)
856 { 858 {
857 len = lame_encode_buffer(lame, tmp, tmp, len/2, 859 len = lame_encode_buffer(lame, (short *)tmp, (short *)tmp, len/2,
858 mux_a->buffer+mux_a->buffer_len, mux_a->buffer_size-mux_a->buffer_len); 860 mux_a->buffer+mux_a->buffer_len, mux_a->buffer_size-mux_a->buffer_len);
859 } 861 }
860 else 862 else
861 { 863 {
862 len=lame_encode_buffer_interleaved(lame, 864 len=lame_encode_buffer_interleaved(lame,
863 tmp,len/4, 865 (short *)tmp,len/4,
864 mux_a->buffer+mux_a->buffer_len,mux_a->buffer_size-mux_a->buffer_len); 866 mux_a->buffer+mux_a->buffer_len,mux_a->buffer_size-mux_a->buffer_len);
865 } 867 }
866 if(len<0) break; // error 868 if(len<0) break; // error
867 mux_a->buffer_len+=len; 869 mux_a->buffer_len+=len;
868 } 870 }
876 int len=dec_audio(sh_audio,tmp,2304); 878 int len=dec_audio(sh_audio,tmp,2304);
877 if(len<=0) break; // eof 879 if(len<=0) break; // eof
878 /* mono encoding, a bit tricky */ 880 /* mono encoding, a bit tricky */
879 if (mux_a->wf->nChannels == 1) 881 if (mux_a->wf->nChannels == 1)
880 { 882 {
881 len = lame_encode_buffer(lame, tmp, tmp, len/2, 883 len = lame_encode_buffer(lame, (short *)tmp, (short *)tmp, len/2,
882 mux_a->buffer+mux_a->buffer_len, mux_a->buffer_size-mux_a->buffer_len); 884 mux_a->buffer+mux_a->buffer_len, mux_a->buffer_size-mux_a->buffer_len);
883 } 885 }
884 else 886 else
885 { 887 {
886 len=lame_encode_buffer_interleaved(lame, 888 len=lame_encode_buffer_interleaved(lame,
887 tmp,len/4, 889 (short *)tmp,len/4,
888 mux_a->buffer+mux_a->buffer_len,mux_a->buffer_size-mux_a->buffer_len); 890 mux_a->buffer+mux_a->buffer_len,mux_a->buffer_size-mux_a->buffer_len);
889 } 891 }
890 if(len<0) break; // error 892 if(len<0) break; // error
891 mux_a->buffer_len+=len; 893 mux_a->buffer_len+=len;
892 } 894 }
974 case VCODEC_COPY: 976 case VCODEC_COPY:
975 mux_v->buffer=start; 977 mux_v->buffer=start;
976 if(skip_flag<=0) aviwrite_write_chunk(muxer,mux_v,muxer_f,in_size,(sh_video->ds->flags&1)?0x10:0); 978 if(skip_flag<=0) aviwrite_write_chunk(muxer,mux_v,muxer_f,in_size,(sh_video->ds->flags&1)?0x10:0);
977 break; 979 break;
978 case VCODEC_FRAMENO: 980 case VCODEC_FRAMENO:
979 mux_v->buffer=&decoded_frameno; // tricky 981 mux_v->buffer=(unsigned char *)&decoded_frameno; // tricky
980 if(skip_flag<=0) aviwrite_write_chunk(muxer,mux_v,muxer_f,sizeof(int),0x10); 982 if(skip_flag<=0) aviwrite_write_chunk(muxer,mux_v,muxer_f,sizeof(int),0x10);
981 break; 983 break;
982 default: 984 default:
983 // decode_video will callback down to ve_*.c encoders, through the video filters 985 // decode_video will callback down to ve_*.c encoders, through the video filters
984 blit_frame=decode_video(sh_video,start,in_size,(skip_flag>0)?1:0); 986 blit_frame=decode_video(sh_video,start,in_size,(skip_flag>0)?1:0);