corresponding AVMEDIA_TYPE_* symbols.
Originally committed as revision 25201 to svn://svn.ffmpeg.org/ffmpeg/trunk
AVCodec ansi_decoder = {
.name = "ansi",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_ANSI,
.priv_data_size = sizeof(AnsiContext),
.init = decode_init,
AVCodec libxavs_encoder = {
.name = "libxavs",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_CAVS,
.priv_data_size = sizeof(XavsContext),
.init = XAVS_init,
AVCodec pictor_decoder = {
"pictor",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_PICTOR,
sizeof(PicContext),
NULL,
AVCodec ra_144_encoder =
{
"real_144",
- CODEC_TYPE_AUDIO,
+ AVMEDIA_TYPE_AUDIO,
CODEC_ID_RA_144,
sizeof(RA144Context),
ra144_encode_init,
.inputs = (AVFilterPad[]) {{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.request_frame = color_request_frame,
.config_props = color_config_props },
{ .name = NULL}},
av_reduce(&st->sample_aspect_ratio.num,
&st->sample_aspect_ratio.den,
dar[i].num, dar[i].den, INT_MAX);
- } else if ((dar[0].num > 0) && (dar[0].den > 0) && (st->codec->codec_type==CODEC_TYPE_VIDEO)) // Use ASF container value if the stream doesn't AR set.
+ } else if ((dar[0].num > 0) && (dar[0].den > 0) && (st->codec->codec_type==AVMEDIA_TYPE_VIDEO)) // Use ASF container value if the stream doesn't AR set.
av_reduce(&st->sample_aspect_ratio.num,
&st->sample_aspect_ratio.den,
dar[0].num, dar[0].den, INT_MAX);
/* all audio frames are the same size, so use the size of the first chunk for block_align */
ast->codec->block_align = AV_RL32(&preamble[0]);
- ast->codec->codec_type = CODEC_TYPE_AUDIO;
+ ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
ast->codec->codec_id = CODEC_ID_PCM_U8;
ast->codec->codec_tag = 0;
ast->codec->sample_rate = FLIC_TFTD_SAMPLE_RATE;
/* Add EOS tag */
for (i = 0; i < s->nb_streams; i++) {
AVCodecContext *enc = s->streams[i]->codec;
- if (enc->codec_type == CODEC_TYPE_VIDEO &&
+ if (enc->codec_type == AVMEDIA_TYPE_VIDEO &&
enc->codec_id == CODEC_ID_H264) {
put_avc_eos_tag(pb, flv->last_video_ts);
}
}
ts = pkt->dts + flv->delay; // add delay to force positive dts
- if (enc->codec_type == CODEC_TYPE_VIDEO) {
+ if (enc->codec_type == AVMEDIA_TYPE_VIDEO) {
if (flv->last_video_ts < ts)
flv->last_video_ts = ts;
}
RTPDynamicProtocolHandler ff_qdm2_dynamic_handler = {
"X-QDM",
- CODEC_TYPE_AUDIO,
+ AVMEDIA_TYPE_AUDIO,
CODEC_ID_NONE,
NULL,
qdm2_extradata_new,
RTPDynamicProtocolHandler ff_svq3_dynamic_handler = {
"X-SV3V-ES",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_NONE, // see if (config_packet) above
NULL, // parse sdp line
svq3_extradata_new,
if (!st)
return AVERROR(ENOMEM);
st->codec->codec_tag = 0;
- st->codec->codec_type = CODEC_TYPE_VIDEO;
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_ANSI;
if (ap->width) st->codec->width = ap->width;
if (ap->height) st->codec->height = ap->height;