Mercurial > libavcodec.hg
comparison h263dec.c @ 2552:9a7770ebed14 libavcodec
AVOption removial patch from (James A. Morrison >ja2morri csclub.uwaterloo ca>)
with minor changes from me
author | michael |
---|---|
date | Sun, 06 Mar 2005 23:20:53 +0000 |
parents | 81a9f883a17a |
children | 511e3afc43e1 |
comparison
equal
deleted
inserted
replaced
2551:615995277bc5 | 2552:9a7770ebed14 |
---|---|
781 #endif | 781 #endif |
782 | 782 |
783 return get_consumed_bytes(s, buf_size); | 783 return get_consumed_bytes(s, buf_size); |
784 } | 784 } |
785 | 785 |
786 static const AVOption mpeg4_decoptions[] = | |
787 { | |
788 AVOPTION_SUB(avoptions_workaround_bug), | |
789 AVOPTION_END() | |
790 }; | |
791 | |
792 AVCodec mpeg4_decoder = { | 786 AVCodec mpeg4_decoder = { |
793 "mpeg4", | 787 "mpeg4", |
794 CODEC_TYPE_VIDEO, | 788 CODEC_TYPE_VIDEO, |
795 CODEC_ID_MPEG4, | 789 CODEC_ID_MPEG4, |
796 sizeof(MpegEncContext), | 790 sizeof(MpegEncContext), |
797 ff_h263_decode_init, | 791 ff_h263_decode_init, |
798 NULL, | 792 NULL, |
799 ff_h263_decode_end, | 793 ff_h263_decode_end, |
800 ff_h263_decode_frame, | 794 ff_h263_decode_frame, |
801 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, | 795 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
802 .options = mpeg4_decoptions, | |
803 .flush= ff_mpeg_flush, | 796 .flush= ff_mpeg_flush, |
804 }; | 797 }; |
805 | 798 |
806 AVCodec h263_decoder = { | 799 AVCodec h263_decoder = { |
807 "h263", | 800 "h263", |
824 ff_h263_decode_init, | 817 ff_h263_decode_init, |
825 NULL, | 818 NULL, |
826 ff_h263_decode_end, | 819 ff_h263_decode_end, |
827 ff_h263_decode_frame, | 820 ff_h263_decode_frame, |
828 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, | 821 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
829 mpeg4_decoptions, | |
830 }; | 822 }; |
831 | 823 |
832 AVCodec msmpeg4v2_decoder = { | 824 AVCodec msmpeg4v2_decoder = { |
833 "msmpeg4v2", | 825 "msmpeg4v2", |
834 CODEC_TYPE_VIDEO, | 826 CODEC_TYPE_VIDEO, |
837 ff_h263_decode_init, | 829 ff_h263_decode_init, |
838 NULL, | 830 NULL, |
839 ff_h263_decode_end, | 831 ff_h263_decode_end, |
840 ff_h263_decode_frame, | 832 ff_h263_decode_frame, |
841 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, | 833 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
842 mpeg4_decoptions, | |
843 }; | 834 }; |
844 | 835 |
845 AVCodec msmpeg4v3_decoder = { | 836 AVCodec msmpeg4v3_decoder = { |
846 "msmpeg4", | 837 "msmpeg4", |
847 CODEC_TYPE_VIDEO, | 838 CODEC_TYPE_VIDEO, |
850 ff_h263_decode_init, | 841 ff_h263_decode_init, |
851 NULL, | 842 NULL, |
852 ff_h263_decode_end, | 843 ff_h263_decode_end, |
853 ff_h263_decode_frame, | 844 ff_h263_decode_frame, |
854 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, | 845 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
855 .options = mpeg4_decoptions, | |
856 }; | 846 }; |
857 | 847 |
858 AVCodec wmv1_decoder = { | 848 AVCodec wmv1_decoder = { |
859 "wmv1", | 849 "wmv1", |
860 CODEC_TYPE_VIDEO, | 850 CODEC_TYPE_VIDEO, |
863 ff_h263_decode_init, | 853 ff_h263_decode_init, |
864 NULL, | 854 NULL, |
865 ff_h263_decode_end, | 855 ff_h263_decode_end, |
866 ff_h263_decode_frame, | 856 ff_h263_decode_frame, |
867 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, | 857 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
868 mpeg4_decoptions, | |
869 }; | 858 }; |
870 | 859 |
871 AVCodec h263i_decoder = { | 860 AVCodec h263i_decoder = { |
872 "h263i", | 861 "h263i", |
873 CODEC_TYPE_VIDEO, | 862 CODEC_TYPE_VIDEO, |
876 ff_h263_decode_init, | 865 ff_h263_decode_init, |
877 NULL, | 866 NULL, |
878 ff_h263_decode_end, | 867 ff_h263_decode_end, |
879 ff_h263_decode_frame, | 868 ff_h263_decode_frame, |
880 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, | 869 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
881 mpeg4_decoptions, | |
882 }; | 870 }; |
883 | 871 |
884 AVCodec flv_decoder = { | 872 AVCodec flv_decoder = { |
885 "flv", | 873 "flv", |
886 CODEC_TYPE_VIDEO, | 874 CODEC_TYPE_VIDEO, |