Revision 40c5fa26 libavcodec/h263dec.c

View differences:

libavcodec/h263dec.c
783 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 786
AVCodec mpeg4_decoder = {
793 787
    "mpeg4",
794 788
    CODEC_TYPE_VIDEO,
......
799 793
    ff_h263_decode_end,
800 794
    ff_h263_decode_frame,
801 795
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
802
    .options = mpeg4_decoptions,
803 796
    .flush= ff_mpeg_flush,
804 797
};
805 798

  
......
826 819
    ff_h263_decode_end,
827 820
    ff_h263_decode_frame,
828 821
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
829
    mpeg4_decoptions,
830 822
};
831 823

  
832 824
AVCodec msmpeg4v2_decoder = {
......
839 831
    ff_h263_decode_end,
840 832
    ff_h263_decode_frame,
841 833
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
842
    mpeg4_decoptions,
843 834
};
844 835

  
845 836
AVCodec msmpeg4v3_decoder = {
......
852 843
    ff_h263_decode_end,
853 844
    ff_h263_decode_frame,
854 845
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
855
    .options = mpeg4_decoptions,
856 846
};
857 847

  
858 848
AVCodec wmv1_decoder = {
......
865 855
    ff_h263_decode_end,
866 856
    ff_h263_decode_frame,
867 857
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
868
    mpeg4_decoptions,
869 858
};
870 859

  
871 860
AVCodec h263i_decoder = {
......
878 867
    ff_h263_decode_end,
879 868
    ff_h263_decode_frame,
880 869
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
881
    mpeg4_decoptions,
882 870
};
883 871

  
884 872
AVCodec flv_decoder = {

Also available in: Unified diff