Mercurial > libavcodec.hg

comparison mpegvideo_enc.c @ 6788:e1302edb0f69 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace some occurrences of -1 with PIX_FMT_NONE. Fixes icc warning #188: enumerated type mixed with another type
author cehoyos
date Sun, 11 May 2008 22:28:43 +0000
parents e88e719b5e77
children 130784da5595
comparison
equal deleted inserted replaced
6787:d24da66bec76 6788:e1302edb0f69
3741 CODEC_ID_H263, 3741 CODEC_ID_H263,
3742 sizeof(MpegEncContext), 3742 sizeof(MpegEncContext),
3743 MPV_encode_init, 3743 MPV_encode_init,
3744 MPV_encode_picture, 3744 MPV_encode_picture,
3745 MPV_encode_end, 3745 MPV_encode_end,
3746 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, 3746 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
3747 .long_name= "H.263", 3747 .long_name= "H.263",
3748 }; 3748 };
3749 3749
3750 AVCodec h263p_encoder = { 3750 AVCodec h263p_encoder = {
3751 "h263p", 3751 "h263p",
3753 CODEC_ID_H263P, 3753 CODEC_ID_H263P,
3754 sizeof(MpegEncContext), 3754 sizeof(MpegEncContext),
3755 MPV_encode_init, 3755 MPV_encode_init,
3756 MPV_encode_picture, 3756 MPV_encode_picture,
3757 MPV_encode_end, 3757 MPV_encode_end,
3758 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, 3758 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
3759 .long_name= "H.263+ / H.263 version 2", 3759 .long_name= "H.263+ / H.263 version 2",
3760 }; 3760 };
3761 3761
3762 AVCodec flv_encoder = { 3762 AVCodec flv_encoder = {
3763 "flv", 3763 "flv",
3765 CODEC_ID_FLV1, 3765 CODEC_ID_FLV1,
3766 sizeof(MpegEncContext), 3766 sizeof(MpegEncContext),
3767 MPV_encode_init, 3767 MPV_encode_init,
3768 MPV_encode_picture, 3768 MPV_encode_picture,
3769 MPV_encode_end, 3769 MPV_encode_end,
3770 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, 3770 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
3771 .long_name= "Flash Video", 3771 .long_name= "Flash Video",
3772 }; 3772 };
3773 3773
3774 AVCodec rv10_encoder = { 3774 AVCodec rv10_encoder = {
3775 "rv10", 3775 "rv10",
3777 CODEC_ID_RV10, 3777 CODEC_ID_RV10,
3778 sizeof(MpegEncContext), 3778 sizeof(MpegEncContext),
3779 MPV_encode_init, 3779 MPV_encode_init,
3780 MPV_encode_picture, 3780 MPV_encode_picture,
3781 MPV_encode_end, 3781 MPV_encode_end,
3782 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, 3782 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
3783 .long_name= "RealVideo 1.0", 3783 .long_name= "RealVideo 1.0",
3784 }; 3784 };
3785 3785
3786 AVCodec rv20_encoder = { 3786 AVCodec rv20_encoder = {
3787 "rv20", 3787 "rv20",
3789 CODEC_ID_RV20, 3789 CODEC_ID_RV20,
3790 sizeof(MpegEncContext), 3790 sizeof(MpegEncContext),
3791 MPV_encode_init, 3791 MPV_encode_init,
3792 MPV_encode_picture, 3792 MPV_encode_picture,
3793 MPV_encode_end, 3793 MPV_encode_end,
3794 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, 3794 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
3795 .long_name= "RealVideo 2.0", 3795 .long_name= "RealVideo 2.0",
3796 }; 3796 };
3797 3797
3798 AVCodec mpeg4_encoder = { 3798 AVCodec mpeg4_encoder = {
3799 "mpeg4", 3799 "mpeg4",
3801 CODEC_ID_MPEG4, 3801 CODEC_ID_MPEG4,
3802 sizeof(MpegEncContext), 3802 sizeof(MpegEncContext),
3803 MPV_encode_init, 3803 MPV_encode_init,
3804 MPV_encode_picture, 3804 MPV_encode_picture,
3805 MPV_encode_end, 3805 MPV_encode_end,
3806 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, 3806 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
3807 .capabilities= CODEC_CAP_DELAY, 3807 .capabilities= CODEC_CAP_DELAY,
3808 .long_name= "MPEG-4 part 2", 3808 .long_name= "MPEG-4 part 2",
3809 }; 3809 };
3810 3810
3811 AVCodec msmpeg4v1_encoder = { 3811 AVCodec msmpeg4v1_encoder = {
3814 CODEC_ID_MSMPEG4V1, 3814 CODEC_ID_MSMPEG4V1,
3815 sizeof(MpegEncContext), 3815 sizeof(MpegEncContext),
3816 MPV_encode_init, 3816 MPV_encode_init,
3817 MPV_encode_picture, 3817 MPV_encode_picture,
3818 MPV_encode_end, 3818 MPV_encode_end,
3819 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, 3819 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
3820 .long_name= "MPEG-4 part 2 Microsoft variant version 1", 3820 .long_name= "MPEG-4 part 2 Microsoft variant version 1",
3821 }; 3821 };
3822 3822
3823 AVCodec msmpeg4v2_encoder = { 3823 AVCodec msmpeg4v2_encoder = {
3824 "msmpeg4v2", 3824 "msmpeg4v2",
3826 CODEC_ID_MSMPEG4V2, 3826 CODEC_ID_MSMPEG4V2,
3827 sizeof(MpegEncContext), 3827 sizeof(MpegEncContext),
3828 MPV_encode_init, 3828 MPV_encode_init,
3829 MPV_encode_picture, 3829 MPV_encode_picture,
3830 MPV_encode_end, 3830 MPV_encode_end,
3831 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, 3831 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
3832 .long_name= "MPEG-4 part 2 Microsoft variant version 2", 3832 .long_name= "MPEG-4 part 2 Microsoft variant version 2",
3833 }; 3833 };
3834 3834
3835 AVCodec msmpeg4v3_encoder = { 3835 AVCodec msmpeg4v3_encoder = {
3836 "msmpeg4", 3836 "msmpeg4",
3838 CODEC_ID_MSMPEG4V3, 3838 CODEC_ID_MSMPEG4V3,
3839 sizeof(MpegEncContext), 3839 sizeof(MpegEncContext),
3840 MPV_encode_init, 3840 MPV_encode_init,
3841 MPV_encode_picture, 3841 MPV_encode_picture,
3842 MPV_encode_end, 3842 MPV_encode_end,
3843 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, 3843 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
3844 .long_name= "MPEG-4 part 2 Microsoft variant version 3", 3844 .long_name= "MPEG-4 part 2 Microsoft variant version 3",
3845 }; 3845 };
3846 3846
3847 AVCodec wmv1_encoder = { 3847 AVCodec wmv1_encoder = {
3848 "wmv1", 3848 "wmv1",
3850 CODEC_ID_WMV1, 3850 CODEC_ID_WMV1,
3851 sizeof(MpegEncContext), 3851 sizeof(MpegEncContext),
3852 MPV_encode_init, 3852 MPV_encode_init,
3853 MPV_encode_picture, 3853 MPV_encode_picture,
3854 MPV_encode_end, 3854 MPV_encode_end,
3855 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, 3855 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
3856 .long_name= "Windows Media Video 7", 3856 .long_name= "Windows Media Video 7",
3857 }; 3857 };