Mercurial > libavcodec.hg
comparison msmpeg4.c @ 12108:c35d7bc64882 libavcodec
Add new decoder property max_lowres and do not init decoder if requested value is higher.
author | cehoyos |
---|---|
date | Wed, 07 Jul 2010 21:23:36 +0000 |
parents | 7dd2a45249a9 |
children | 7c9d711a4201 |
comparison
equal
deleted
inserted
replaced
12107:1e4996a88ca5 | 12108:c35d7bc64882 |
---|---|
1927 ff_msmpeg4_decode_init, | 1927 ff_msmpeg4_decode_init, |
1928 NULL, | 1928 NULL, |
1929 ff_h263_decode_end, | 1929 ff_h263_decode_end, |
1930 ff_h263_decode_frame, | 1930 ff_h263_decode_frame, |
1931 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, | 1931 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
1932 .max_lowres= 3, | |
1932 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"), | 1933 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"), |
1933 .pix_fmts= ff_pixfmt_list_420, | 1934 .pix_fmts= ff_pixfmt_list_420, |
1934 }; | 1935 }; |
1935 | 1936 |
1936 AVCodec msmpeg4v2_decoder = { | 1937 AVCodec msmpeg4v2_decoder = { |
1941 ff_msmpeg4_decode_init, | 1942 ff_msmpeg4_decode_init, |
1942 NULL, | 1943 NULL, |
1943 ff_h263_decode_end, | 1944 ff_h263_decode_end, |
1944 ff_h263_decode_frame, | 1945 ff_h263_decode_frame, |
1945 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, | 1946 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
1947 .max_lowres= 3, | |
1946 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), | 1948 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), |
1947 .pix_fmts= ff_pixfmt_list_420, | 1949 .pix_fmts= ff_pixfmt_list_420, |
1948 }; | 1950 }; |
1949 | 1951 |
1950 AVCodec msmpeg4v3_decoder = { | 1952 AVCodec msmpeg4v3_decoder = { |
1955 ff_msmpeg4_decode_init, | 1957 ff_msmpeg4_decode_init, |
1956 NULL, | 1958 NULL, |
1957 ff_h263_decode_end, | 1959 ff_h263_decode_end, |
1958 ff_h263_decode_frame, | 1960 ff_h263_decode_frame, |
1959 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, | 1961 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
1962 .max_lowres= 3, | |
1960 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), | 1963 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), |
1961 .pix_fmts= ff_pixfmt_list_420, | 1964 .pix_fmts= ff_pixfmt_list_420, |
1962 }; | 1965 }; |
1963 | 1966 |
1964 AVCodec wmv1_decoder = { | 1967 AVCodec wmv1_decoder = { |
1969 ff_msmpeg4_decode_init, | 1972 ff_msmpeg4_decode_init, |
1970 NULL, | 1973 NULL, |
1971 ff_h263_decode_end, | 1974 ff_h263_decode_end, |
1972 ff_h263_decode_frame, | 1975 ff_h263_decode_frame, |
1973 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, | 1976 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
1977 .max_lowres= 3, | |
1974 .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"), | 1978 .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"), |
1975 .pix_fmts= ff_pixfmt_list_420, | 1979 .pix_fmts= ff_pixfmt_list_420, |
1976 }; | 1980 }; |