Revision 72415b2a libavformat/gxf.c

View differences:

libavformat/gxf.c
87 87
    switch (format) {
88 88
        case 3:
89 89
        case 4:
90
            st->codec->codec_type = CODEC_TYPE_VIDEO;
90
            st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
91 91
            st->codec->codec_id = CODEC_ID_MJPEG;
92 92
            break;
93 93
        case 13:
94 94
        case 15:
95
            st->codec->codec_type = CODEC_TYPE_VIDEO;
95
            st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
96 96
            st->codec->codec_id = CODEC_ID_DVVIDEO;
97 97
            break;
98 98
        case 14:
99 99
        case 16:
100
            st->codec->codec_type = CODEC_TYPE_VIDEO;
100
            st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
101 101
            st->codec->codec_id = CODEC_ID_DVVIDEO;
102 102
            break;
103 103
        case 11:
104 104
        case 12:
105 105
        case 20:
106
            st->codec->codec_type = CODEC_TYPE_VIDEO;
106
            st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
107 107
            st->codec->codec_id = CODEC_ID_MPEG2VIDEO;
108 108
            st->need_parsing = AVSTREAM_PARSE_HEADERS; //get keyframe flag etc.
109 109
            break;
110 110
        case 22:
111 111
        case 23:
112
            st->codec->codec_type = CODEC_TYPE_VIDEO;
112
            st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
113 113
            st->codec->codec_id = CODEC_ID_MPEG1VIDEO;
114 114
            st->need_parsing = AVSTREAM_PARSE_HEADERS; //get keyframe flag etc.
115 115
            break;
116 116
        case 9:
117
            st->codec->codec_type = CODEC_TYPE_AUDIO;
117
            st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
118 118
            st->codec->codec_id = CODEC_ID_PCM_S24LE;
119 119
            st->codec->channels = 1;
120 120
            st->codec->sample_rate = 48000;
......
123 123
            st->codec->bits_per_coded_sample = 24;
124 124
            break;
125 125
        case 10:
126
            st->codec->codec_type = CODEC_TYPE_AUDIO;
126
            st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
127 127
            st->codec->codec_id = CODEC_ID_PCM_S16LE;
128 128
            st->codec->channels = 1;
129 129
            st->codec->sample_rate = 48000;
......
132 132
            st->codec->bits_per_coded_sample = 16;
133 133
            break;
134 134
        case 17:
135
            st->codec->codec_type = CODEC_TYPE_AUDIO;
135
            st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
136 136
            st->codec->codec_id = CODEC_ID_AC3;
137 137
            st->codec->channels = 2;
138 138
            st->codec->sample_rate = 48000;
......
141 141
        case 7:
142 142
        case 8:
143 143
        case 24:
144
            st->codec->codec_type = CODEC_TYPE_DATA;
144
            st->codec->codec_type = AVMEDIA_TYPE_DATA;
145 145
            st->codec->codec_id = CODEC_ID_NONE;
146 146
            break;
147 147
        default:
148
            st->codec->codec_type = CODEC_TYPE_UNKNOWN;
148
            st->codec->codec_type = AVMEDIA_TYPE_UNKNOWN;
149 149
            st->codec->codec_id = CODEC_ID_NONE;
150 150
            break;
151 151
    }

Also available in: Unified diff