Revision 72415b2a libavformat/mxfdec.c

View differences:

libavformat/mxfdec.c
795 795
            st->codec->extradata = descriptor->extradata;
796 796
            st->codec->extradata_size = descriptor->extradata_size;
797 797
        }
798
        if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
798
        if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
799 799
            container_ul = mxf_get_codec_ul(mxf_essence_container_uls, essence_container_ul);
800 800
            if (st->codec->codec_id == CODEC_ID_NONE)
801 801
                st->codec->codec_id = container_ul->id;
......
803 803
            st->codec->height = descriptor->height;
804 804
            st->codec->bits_per_coded_sample = descriptor->bits_per_sample; /* Uncompressed */
805 805
            st->need_parsing = AVSTREAM_PARSE_HEADERS;
806
        } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
806
        } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
807 807
            container_ul = mxf_get_codec_ul(mxf_essence_container_uls, essence_container_ul);
808 808
            if (st->codec->codec_id == CODEC_ID_NONE)
809 809
                st->codec->codec_id = container_ul->id;
......
825 825
                st->need_parsing = AVSTREAM_PARSE_FULL;
826 826
            }
827 827
        }
828
        if (st->codec->codec_type != CODEC_TYPE_DATA && (*essence_container_ul)[15] > 0x01) {
828
        if (st->codec->codec_type != AVMEDIA_TYPE_DATA && (*essence_container_ul)[15] > 0x01) {
829 829
            av_log(mxf->fc, AV_LOG_WARNING, "only frame wrapped mappings are correctly supported\n");
830 830
            st->need_parsing = AVSTREAM_PARSE_FULL;
831 831
        }

Also available in: Unified diff