diff --git a/avconv.c b/avconv.c
index c48d16777cf4dd69a4ad932ed5d78e1c08763443..c1168302bc433f0b73546ced3fa7afbb69bc2ff5 100644
--- a/avconv.c
+++ b/avconv.c
@@ -249,7 +249,7 @@ static void abort_codec_experimental(AVCodec *c, int encoder)
"results.\nAdd '-strict experimental' if you want to use it.\n",
codec_string, c->name);
codec = encoder ? avcodec_find_encoder(c->id) : avcodec_find_decoder(c->id);
- if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL))
+ if (!(codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL))
av_log(NULL, AV_LOG_FATAL, "Or use the non experimental %s '%s'.\n",
codec_string, codec->name);
exit_program(1);
@@ -614,7 +614,7 @@ static int poll_filter(OutputStream *ost)
filtered_frame = ost->filtered_frame;
if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&
- !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
+ !(ost->enc->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE))
ret = av_buffersink_get_samples(ost->filter->filter, filtered_frame,
ost->enc_ctx->frame_size);
else
@@ -1353,7 +1353,7 @@ static void process_input_packet(InputStream *ist, const AVPacket *pkt)
ist->last_dts = ist->next_dts;
if (avpkt.size && avpkt.size != pkt->size &&
- !(ist->dec->capabilities & CODEC_CAP_SUBFRAMES)) {
+ !(ist->dec->capabilities & AV_CODEC_CAP_SUBFRAMES)) {
av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING,
"Multiple frames in a packet from stream %d\n", pkt->stream_index);
ist->showed_multi_packet_warning = 1;
diff --git a/avplay.c b/avplay.c
index fe9298e64907a8eaaca2e2e2338c991007ff2a34..546fb905663356756f881cafe78e1a1dbba62244 100644
--- a/avplay.c
+++ b/avplay.c
@@ -1908,7 +1908,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
if (!got_frame) {
/* stop sending empty packets if the decoder is finished */
- if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY)
+ if (!pkt_temp->data && (dec->codec->capabilities & AV_CODEC_CAP_DELAY))
flush_complete = 1;
continue;
}
@@ -2470,7 +2470,7 @@ static int decode_thread(void *arg)
packet_queue_put(&is->videoq, pkt);
}
if (is->audio_stream >= 0 &&
- is->audio_st->codec->codec->capabilities & CODEC_CAP_DELAY) {
+ (is->audio_st->codec->codec->capabilities & AV_CODEC_CAP_DELAY)) {
av_init_packet(pkt);
pkt->data = NULL;
pkt->size = 0;
diff --git a/cmdutils.c b/cmdutils.c
index e5cba98a6060b1f4f2448fcffb6ff729dee0b215..a4a4ae0e142deba4f70b83e01d5ec4de46323fa9 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -979,12 +979,12 @@ static void print_codec(const AVCodec *c)
if (c->type == AVMEDIA_TYPE_VIDEO) {
printf(" Threading capabilities: ");
- switch (c->capabilities & (CODEC_CAP_FRAME_THREADS |
- CODEC_CAP_SLICE_THREADS)) {
- case CODEC_CAP_FRAME_THREADS |
- CODEC_CAP_SLICE_THREADS: printf("frame and slice"); break;
- case CODEC_CAP_FRAME_THREADS: printf("frame"); break;
- case CODEC_CAP_SLICE_THREADS: printf("slice"); break;
+ switch (c->capabilities & (AV_CODEC_CAP_FRAME_THREADS |
+ AV_CODEC_CAP_SLICE_THREADS)) {
+ case AV_CODEC_CAP_FRAME_THREADS |
+ AV_CODEC_CAP_SLICE_THREADS: printf("frame and slice"); break;
+ case AV_CODEC_CAP_FRAME_THREADS: printf("frame"); break;
+ case AV_CODEC_CAP_SLICE_THREADS: printf("slice"); break;
default: printf("no"); break;
}
printf("\n");
@@ -1115,9 +1115,9 @@ static void print_codecs(int encoder)
while ((codec = next_codec_for_id(desc->id, codec, encoder))) {
printf("%c", get_media_type_char(desc->type));
- printf((codec->capabilities & CODEC_CAP_FRAME_THREADS) ? "F" : ".");
- printf((codec->capabilities & CODEC_CAP_SLICE_THREADS) ? "S" : ".");
- printf((codec->capabilities & CODEC_CAP_EXPERIMENTAL) ? "X" : ".");
+ printf((codec->capabilities & AV_CODEC_CAP_FRAME_THREADS) ? "F" : ".");
+ printf((codec->capabilities & AV_CODEC_CAP_SLICE_THREADS) ? "S" : ".");
+ printf((codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) ? "X" : ".");
printf(" %-20s %s", codec->name, codec->long_name ? codec->long_name : "");
if (strcmp(codec->name, desc->name))
diff --git a/doc/examples/avcodec.c b/doc/examples/avcodec.c
index 1fd0a602543f60113bc2658ca9846283e5db47a4..485911a67f83b4d5d9a12526fb933039d0497643 100644
--- a/doc/examples/avcodec.c
+++ b/doc/examples/avcodec.c
@@ -480,7 +480,7 @@ static void video_decode_example(const char *outfilename, const char *filename)
c = avcodec_alloc_context3(codec);
picture = av_frame_alloc();
- if(codec->capabilities&CODEC_CAP_TRUNCATED)
+ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
c->flags |= AV_CODEC_FLAG_TRUNCATED; // we do not send complete frames
/* For some codecs, such as msmpeg4 and mpeg4, width and height
diff --git a/doc/examples/output.c b/doc/examples/output.c
index b46f9bc458a4a6dcd7ccef8ba6217eaba9e79959..af5445b8369f7acdd77b78a0d6993f467f0c9905 100644
--- a/doc/examples/output.c
+++ b/doc/examples/output.c
@@ -178,7 +178,7 @@ static void open_audio(AVFormatContext *oc, OutputStream *ost)
/* increment frequency by 110 Hz per second */
ost->tincr2 = 2 * M_PI * 110.0 / c->sample_rate / c->sample_rate;
- if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)
+ if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)
nb_samples = 10000;
else
nb_samples = c->frame_size;
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index ab74225380946b54948f1cf76a818b443d429202..4c0b4e3f984a69c0ac7e5322bf8bf4c35f15c011 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -981,5 +981,5 @@ AVCodec ff_fourxm_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index 3fd15e05eb42bdda4662dce1bc526a72a66c311d..78b616fdf4c3c963655111fa537db06afa728c45 100644
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -193,5 +193,5 @@ AVCodec ff_eightbps_decoder = {
.priv_data_size = sizeof(EightBpsContext),
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
index b973771fa5c986080f8ead6933ac7cf1ae3c2974..fe90b168e37edc430f75caa014322dd91dd8baf0 100644
--- a/libavcodec/8svx.c
+++ b/libavcodec/8svx.c
@@ -205,7 +205,7 @@ AVCodec ff_eightsvx_fib_decoder = {
.init = eightsvx_decode_init,
.close = eightsvx_decode_close,
.decode = eightsvx_decode_frame,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
AV_SAMPLE_FMT_NONE },
};
@@ -219,7 +219,7 @@ AVCodec ff_eightsvx_exp_decoder = {
.init = eightsvx_decode_init,
.close = eightsvx_decode_close,
.decode = eightsvx_decode_frame,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
AV_SAMPLE_FMT_NONE },
};
@@ -233,7 +233,7 @@ AVCodec ff_pcm_s8_planar_decoder = {
.init = eightsvx_decode_init,
.close = eightsvx_decode_close,
.decode = eightsvx_decode_frame,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c
index e55383a3a2a6727d80d8989db2d933e86801575b..c5e50029c6220678d3a45ff157344101d90fc6a3 100644
--- a/libavcodec/a64multienc.c
+++ b/libavcodec/a64multienc.c
@@ -392,7 +392,7 @@ AVCodec ff_a64multi_encoder = {
.encode2 = a64multi_encode_frame,
.close = a64multi_close_encoder,
.pix_fmts = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE},
- .capabilities = CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DELAY,
};
AVCodec ff_a64multi5_encoder = {
@@ -405,5 +405,5 @@ AVCodec ff_a64multi5_encoder = {
.encode2 = a64multi_encode_frame,
.close = a64multi_close_encoder,
.pix_fmts = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE},
- .capabilities = CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DELAY,
};
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 137d37f1bfab987e5e1e79d2a6c22c8f63368354..2528033f045a796ccab628e0d03fb350f9376342 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -3318,7 +3318,7 @@ AVCodec ff_aac_decoder = {
.sample_fmts = (const enum AVSampleFormat[]) {
AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE
},
- .capabilities = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1,
.channel_layouts = aac_channel_layout,
};
@@ -3339,6 +3339,6 @@ AVCodec ff_aac_latm_decoder = {
.sample_fmts = (const enum AVSampleFormat[]) {
AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE
},
- .capabilities = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1,
.channel_layouts = aac_channel_layout,
};
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 1e2544182caeca3868d3784ad83f15940993abe1..815fb848e018488ccd10cd7b2f57039248ab31a2 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -812,8 +812,8 @@ AVCodec ff_aac_encoder = {
.init = aac_encode_init,
.encode2 = aac_encode_frame,
.close = aac_encode_end,
- .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY |
- CODEC_CAP_EXPERIMENTAL,
+ .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY |
+ AV_CODEC_CAP_EXPERIMENTAL,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
.priv_class = &aacenc_class,
diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c
index 1e457ce9625d4b93f6d58277d31e8fae16634ba9..462ee677861249186e6c16961f0eeb9b2c39af8b 100644
--- a/libavcodec/aasc.c
+++ b/libavcodec/aasc.c
@@ -118,5 +118,5 @@ AVCodec ff_aasc_decoder = {
.init = aasc_decode_init,
.close = aasc_decode_end,
.decode = aasc_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index f9dde724721eecda69ce29a8419f96e5a375436f..ca5e441ba65f9eee45e6e078b9a651b67835760b 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -1558,7 +1558,7 @@ AVCodec ff_ac3_decoder = {
.init = ac3_decode_init,
.close = ac3_decode_end,
.decode = ac3_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
.priv_class = &ac3_decoder_class,
@@ -1581,7 +1581,7 @@ AVCodec ff_eac3_decoder = {
.init = ac3_decode_init,
.close = ac3_decode_end,
.decode = ac3_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
.priv_class = &eac3_decoder_class,
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index c6bc4d09d710d68729c957e8ed7dc7ab6920af0c..aa3c7b926217b9646d036b6fcc28f3b45158253c 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1298,7 +1298,7 @@ AVCodec ff_ ## name_ ## _decoder = { \
.priv_data_size = sizeof(ADPCMDecodeContext), \
.init = adpcm_decode_init, \
.decode = adpcm_decode_frame, \
- .capabilities = CODEC_CAP_DR1, \
+ .capabilities = AV_CODEC_CAP_DR1, \
.sample_fmts = sample_fmts_, \
}
diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c
index 14fddf5520b2aa7763b6261bd0adf9f9a4fdb901..dc587b273348515d1c64229b507195d7ba10cc53 100644
--- a/libavcodec/adxdec.c
+++ b/libavcodec/adxdec.c
@@ -182,7 +182,7 @@ AVCodec ff_adpcm_adx_decoder = {
.init = adx_decode_init,
.decode = adx_decode_frame,
.flush = adx_decode_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/aic.c b/libavcodec/aic.c
index aff740cb44b866d9a149c13009fa5918dc59fe0b..9ea27a7ecdac7c7d48984f7f951e4f9d444b5f72 100644
--- a/libavcodec/aic.c
+++ b/libavcodec/aic.c
@@ -484,5 +484,5 @@ AVCodec ff_aic_decoder = {
.init = aic_decode_init,
.close = aic_decode_close,
.decode = aic_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 9579e18185ba347ea0287db16112b23d00cc05e0..72e8a5717b2fc347910c73dfdb73c7ffc2bd69ae 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -587,5 +587,5 @@ AVCodec ff_alac_decoder = {
.init = alac_decode_init,
.close = alac_decode_close,
.decode = alac_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c
index 7777cf7fb427df21375ad5b142b69fd6aee7ea0b..e6e0475fb8f3153577ce16e12a1c3a7b9eae205c 100644
--- a/libavcodec/alacenc.c
+++ b/libavcodec/alacenc.c
@@ -643,7 +643,7 @@ AVCodec ff_alac_encoder = {
.init = alac_encode_init,
.encode2 = alac_encode_frame,
.close = alac_encode_close,
- .capabilities = CODEC_CAP_SMALL_LAST_FRAME,
+ .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME,
.channel_layouts = ff_alac_channel_layouts,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32P,
AV_SAMPLE_FMT_S16P,
diff --git a/libavcodec/aliaspixdec.c b/libavcodec/aliaspixdec.c
index 8969e1765eb42bbf43f5075821233acaced3544d..8c1892490bc6c9aae63c257f0ad9713bca3af77c 100644
--- a/libavcodec/aliaspixdec.c
+++ b/libavcodec/aliaspixdec.c
@@ -124,5 +124,5 @@ AVCodec ff_alias_pix_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_ALIAS_PIX,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 1ade656118f245c4710a30eab9146815388d269d..9d25b57d8f0e09dad37173eef01903fb7cd92f58 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -1812,5 +1812,5 @@ AVCodec ff_als_decoder = {
.close = decode_end,
.decode = decode_frame,
.flush = flush,
- .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c
index 7692cf01c6f92918625b4c0f9709f726cd924c56..60d5683604fbaeb2a9967369315af552d1b539cf 100644
--- a/libavcodec/amrnbdec.c
+++ b/libavcodec/amrnbdec.c
@@ -1070,7 +1070,7 @@ AVCodec ff_amrnb_decoder = {
.priv_data_size = sizeof(AMRContext),
.init = amrnb_decode_init,
.decode = amrnb_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index 5ef22d3d4d4d95ca287f03eb2e2bbe88b2d1330f..bf679e82d9127bcb05eb602640461d3bb05a7bfb 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -1254,7 +1254,7 @@ AVCodec ff_amrwb_decoder = {
.priv_data_size = sizeof(AMRWBContext),
.init = amrwb_decode_init,
.decode = amrwb_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/anm.c b/libavcodec/anm.c
index 3d5affbd63ff2fc141e2162381c5dac1794c690f..b70d220c9a27cf7fe4eca3cbda5ade79b4bdbc24 100644
--- a/libavcodec/anm.c
+++ b/libavcodec/anm.c
@@ -198,5 +198,5 @@ AVCodec ff_anm_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c
index 346a9ca413b0aa83a9c707fe4f8c8b6f6c8ba8b0..070192ad46d0e9d912f442da3e3a7b90ded748db 100644
--- a/libavcodec/ansi.c
+++ b/libavcodec/ansi.c
@@ -450,5 +450,5 @@ AVCodec ff_ansi_decoder = {
.init = decode_init,
.close = decode_close,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 131c6f32d744f8a16628181186217848d4f48ceb..d33139be7dae0f2b9dfec5c460ed104693331d12 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -1596,7 +1596,8 @@ AVCodec ff_ape_decoder = {
.init = ape_decode_init,
.close = ape_decode_close,
.decode = ape_decode_frame,
- .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DELAY | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DELAY |
+ AV_CODEC_CAP_DR1,
.flush = ape_flush,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
AV_SAMPLE_FMT_S16P,
diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c
index 053d37d118c5a43019f6d4b64aec89c38535b2eb..f17f06465cd44a0da2f1f248ecbf5110e940df2b 100644
--- a/libavcodec/asvdec.c
+++ b/libavcodec/asvdec.c
@@ -326,7 +326,7 @@ AVCodec ff_asv1_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
AVCodec ff_asv2_decoder = {
@@ -338,5 +338,5 @@ AVCodec ff_asv2_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c
index e9f69d1d790e0136bbc4eaa026b79fb88e8f255f..e938976d88e2d9eee379b17de92fb09ea31726f1 100644
--- a/libavcodec/atrac1.c
+++ b/libavcodec/atrac1.c
@@ -381,7 +381,7 @@ AVCodec ff_atrac1_decoder = {
.init = atrac1_decode_init,
.close = atrac1_decode_end,
.decode = atrac1_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 3c3d316fe45a0203b92acbeb9baea731624ea02f..c4201fb418921e42911c596b5a4a56d6d0a0b23c 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -928,7 +928,7 @@ AVCodec ff_atrac3_decoder = {
.init_static_data = atrac3_init_static_data,
.close = atrac3_decode_close,
.decode = atrac3_decode_frame,
- .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/atrac3plusdec.c b/libavcodec/atrac3plusdec.c
index 93e75ef70466e8f9da88a55df24232101267caca..4a742c159e78e0e866ef4538a2975299db77200a 100644
--- a/libavcodec/atrac3plusdec.c
+++ b/libavcodec/atrac3plusdec.c
@@ -387,7 +387,7 @@ AVCodec ff_atrac3p_decoder = {
.long_name = NULL_IF_CONFIG_SMALL("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"),
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_ATRAC3P,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.priv_data_size = sizeof(ATRAC3PContext),
.init = atrac3p_decode_init,
.init_static_data = ff_atrac3p_init_vlcs,
diff --git a/libavcodec/aura.c b/libavcodec/aura.c
index a32c18b363cecdb9f0e01e77ce3b7c4c5c64b675..a1ef6f8d10b8c30a289ffc389dc10b3bf4695b7a 100644
--- a/libavcodec/aura.c
+++ b/libavcodec/aura.c
@@ -106,5 +106,5 @@ AVCodec ff_aura2_decoder = {
.id = AV_CODEC_ID_AURA2,
.init = aura_decode_init,
.decode = aura_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 470d25bc7cfdef2e232b9ce22cea571e6e6cba62..362a39752dfd9df5a68c3293598d7db5ec6d390f 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -708,6 +708,95 @@ typedef struct RcOverride{
*/
#define AV_CODEC_FLAG2_IGNORE_CROP (1 << 16)
+/* Unsupported options :
+ * Syntax Arithmetic coding (SAC)
+ * Reference Picture Selection
+ * Independent Segment Decoding */
+/* /Fx */
+/* codec capabilities */
+
+/**
+ * Decoder can use draw_horiz_band callback.
+ */
+#define AV_CODEC_CAP_DRAW_HORIZ_BAND (1 << 0)
+/**
+ * Codec uses get_buffer() for allocating buffers and supports custom allocators.
+ * If not set, it might not use get_buffer() at all or use operations that
+ * assume the buffer was allocated by avcodec_default_get_buffer.
+ */
+#define AV_CODEC_CAP_DR1 (1 << 1)
+#define AV_CODEC_CAP_TRUNCATED (1 << 3)
+/**
+ * Encoder or decoder requires flushing with NULL input at the end in order to
+ * give the complete and correct output.
+ *
+ * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
+ * with NULL data. The user can still send NULL data to the public encode
+ * or decode function, but libavcodec will not pass it along to the codec
+ * unless this flag is set.
+ *
+ * Decoders:
+ * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to get the delayed data until the decoder no longer
+ * returns frames.
+ *
+ * Encoders:
+ * The encoder needs to be fed with NULL data at the end of encoding until the
+ * encoder no longer returns data.
+ *
+ * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
+ * flag also means that the encoder must set the pts and duration for
+ * each output packet. If this flag is not set, the pts and duration will
+ * be determined by libavcodec from the input frame.
+ */
+#define AV_CODEC_CAP_DELAY (1 << 5)
+/**
+ * Codec can be fed a final frame with a smaller size.
+ * This can be used to prevent truncation of the last audio samples.
+ */
+#define AV_CODEC_CAP_SMALL_LAST_FRAME (1 << 6)
+/**
+ * Codec can output multiple frames per AVPacket
+ * Normally demuxers return one frame at a time, demuxers which do not do
+ * are connected to a parser to split what they return into proper frames.
+ * This flag is reserved to the very rare category of codecs which have a
+ * bitstream that cannot be split into frames without timeconsuming
+ * operations like full decoding. Demuxers carring such bitstreams thus
+ * may return multiple frames in a packet. This has many disadvantages like
+ * prohibiting stream copy in many cases thus it should only be considered
+ * as a last resort.
+ */
+#define AV_CODEC_CAP_SUBFRAMES (1 << 8)
+/**
+ * Codec is experimental and is thus avoided in favor of non experimental
+ * encoders
+ */
+#define AV_CODEC_CAP_EXPERIMENTAL (1 << 9)
+/**
+ * Codec should fill in channel configuration and samplerate instead of container
+ */
+#define AV_CODEC_CAP_CHANNEL_CONF (1 << 10)
+/**
+ * Codec supports frame-level multithreading.
+ */
+#define AV_CODEC_CAP_FRAME_THREADS (1 << 12)
+/**
+ * Codec supports slice-based (or partition-based) multithreading.
+ */
+#define AV_CODEC_CAP_SLICE_THREADS (1 << 13)
+/**
+ * Codec supports changed parameters at any point.
+ */
+#define AV_CODEC_CAP_PARAM_CHANGE (1 << 14)
+/**
+ * Codec supports avctx->thread_count == 0 (auto).
+ */
+#define AV_CODEC_CAP_AUTO_THREADS (1 << 15)
+/**
+ * Audio encoder supports receiving a different number of samples in each call.
+ */
+#define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16)
+
/**
* Allow decoders to produce frames with data planes that are not aligned
* to CPU requirements (e.g. due to cropping).
@@ -1931,7 +2020,7 @@ typedef struct AVCodecContext {
*
* - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
* except the last must contain exactly frame_size samples per channel.
- * May be 0 when the codec has CODEC_CAP_VARIABLE_FRAME_SIZE set, then the
+ * May be 0 when the codec has AV_CODEC_CAP_VARIABLE_FRAME_SIZE set, then the
* frame size is not restricted.
* - decoding: may be set by some decoders to indicate constant frame size
*/
@@ -2132,7 +2221,7 @@ typedef struct AVCodecContext {
* buffers than buf[] can hold. extended_buf will be freed in
* av_frame_unref().
*
- * If CODEC_CAP_DR1 is not set then get_buffer2() must call
+ * If AV_CODEC_CAP_DR1 is not set then get_buffer2() must call
* avcodec_default_get_buffer2() instead of providing buffers allocated by
* some other means.
*
@@ -2983,7 +3072,7 @@ typedef struct AVCodec {
enum AVCodecID id;
/**
* Codec capabilities.
- * see CODEC_CAP_*
+ * see AV_CODEC_CAP_*
*/
int capabilities;
const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
@@ -3697,7 +3786,7 @@ attribute_deprecated int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame
/**
* The default callback for AVCodecContext.get_buffer2(). It is made public so
* it can be called by custom get_buffer2() implementations for decoders without
- * CODEC_CAP_DR1 set.
+ * AV_CODEC_CAP_DR1 set.
*/
int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags);
@@ -3721,7 +3810,7 @@ unsigned avcodec_get_edge_width(void);
* buffer that is acceptable for the codec if you do not use any horizontal
* padding.
*
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened.
*/
void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
@@ -3730,7 +3819,7 @@ void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
* buffer that is acceptable for the codec if you also ensure that all
* line sizes are a multiple of the respective linesize_align[i].
*
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened.
*/
void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
int linesize_align[AV_NUM_DATA_POINTERS]);
@@ -3746,13 +3835,13 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
* needs to be fed to the decoder with remaining data until it is completely
* consumed or an error occurs.
*
- * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input
+ * Some decoders (those marked with AV_CODEC_CAP_DELAY) have a delay between input
* and output. This means that for some packets they will not immediately
* produce decoded output and need to be flushed at the end of decoding to get
* all the decoded data. Flushing is done by calling this function with packets
* with avpkt->data set to NULL and avpkt->size set to 0 until it stops
* returning samples. It is safe to flush even those decoders that are not
- * marked with CODEC_CAP_DELAY, then no samples will be returned.
+ * marked with AV_CODEC_CAP_DELAY, then no samples will be returned.
*
* @warning The input buffer, avpkt->data must be FF_INPUT_BUFFER_PADDING_SIZE
* larger than the actual read bytes because some optimized bitstream
@@ -3777,7 +3866,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
* @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
* non-zero. Note that this field being set to zero
* does not mean that an error has occurred. For
- * decoders with CODEC_CAP_DELAY set, no given decode
+ * decoders with AV_CODEC_CAP_DELAY set, no given decode
* call is guaranteed to produce a frame.
* @param[in] avpkt The input AVPacket containing the input buffer.
* At least avpkt->data and avpkt->size should be set. Some
@@ -3801,7 +3890,7 @@ int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
* @warning The end of the input buffer buf should be set to 0 to ensure that
* no overreading happens for damaged MPEG streams.
*
- * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
+ * @note Codecs which have the AV_CODEC_CAP_DELAY capability set have a delay
* between input and output, these need to be fed with avpkt->data=NULL,
* avpkt->size=0 at the end to return the remaining frames.
*
@@ -3841,7 +3930,7 @@ int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
* Return a negative value on error, otherwise return the number of bytes used.
* If no subtitle could be decompressed, got_sub_ptr is zero.
* Otherwise, the subtitle is stored in *sub.
- * Note that CODEC_CAP_DR1 is not available for subtitle codecs. This is for
+ * Note that AV_CODEC_CAP_DR1 is not available for subtitle codecs. This is for
* simplicity, because the performance difference is expect to be negligible
* and reusing a get_buffer written for video codecs would probably perform badly
* due to a potentially very different allocation pattern.
@@ -4163,8 +4252,8 @@ AVCodec *avcodec_find_encoder_by_name(const char *name);
* called to free the user supplied buffer).
* @param[in] frame AVFrame containing the raw audio data to be encoded.
* May be NULL when flushing an encoder that has the
- * CODEC_CAP_DELAY capability set.
- * If CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
+ * AV_CODEC_CAP_DELAY capability set.
+ * If AV_CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
* can have any number of samples.
* If it is not set, frame->nb_samples must be equal to
* avctx->frame_size for all frames except the last.
@@ -4205,7 +4294,7 @@ int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
* called to free the user supplied buffer).
* @param[in] frame AVFrame containing the raw video data to be encoded.
* May be NULL when flushing an encoder that has the
- * CODEC_CAP_DELAY capability set.
+ * AV_CODEC_CAP_DELAY capability set.
* @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
* output packet is non-empty, and to 0 if it is
* empty. If the function returns an error, the
diff --git a/libavcodec/avs.c b/libavcodec/avs.c
index 85d18fd41af69d73c8dc55045ae865316e80a6e0..0d127f85d11b373b4b509b3a64423af3df8a61ee 100644
--- a/libavcodec/avs.c
+++ b/libavcodec/avs.c
@@ -185,5 +185,5 @@ AVCodec ff_avs_decoder = {
.init = avs_decode_init,
.decode = avs_decode_frame,
.close = avs_decode_end,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c
index 7e93a2749c4db458cfe88ac600335ec3c4d7deda..11e2cfaab2720018374ef96c18f53edc8aa05828 100644
--- a/libavcodec/bethsoftvideo.c
+++ b/libavcodec/bethsoftvideo.c
@@ -163,5 +163,5 @@ AVCodec ff_bethsoftvid_decoder = {
.init = bethsoftvid_decode_init,
.close = bethsoftvid_decode_end,
.decode = bethsoftvid_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c
index 75b6710189ee686771d84b51ad9db84461b36bee..8335e9d12596e5bd565e8cdf90d7c8c5acc95cbe 100644
--- a/libavcodec/bfi.c
+++ b/libavcodec/bfi.c
@@ -180,5 +180,5 @@ AVCodec ff_bfi_decoder = {
.init = bfi_decode_init,
.close = bfi_decode_close,
.decode = bfi_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/bink.c b/libavcodec/bink.c
index 58a5ac6c89a54526e5404930941fd8249d4c2e2e..4e7226766776c296e0efe331b483f245a7aeca1e 100644
--- a/libavcodec/bink.c
+++ b/libavcodec/bink.c
@@ -1352,5 +1352,5 @@ AVCodec ff_bink_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index 0b427bfb90b3cb6a8ff800aced898df2095ab549..c709ab03e7cc81be35c061c785fd7dfb804d552d 100644
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -343,7 +343,7 @@ AVCodec ff_binkaudio_rdft_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
};
AVCodec ff_binkaudio_dct_decoder = {
@@ -355,5 +355,5 @@ AVCodec ff_binkaudio_dct_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index 15c33a07c6a6418708c227ae95bd72cebc4defc3..f545e784b8f50e678ccf700d75d0c5b34a6e8ebe 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -353,5 +353,5 @@ AVCodec ff_bmp_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_BMP,
.decode = bmp_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/bmvaudio.c b/libavcodec/bmvaudio.c
index 0f8c2249b2028b547d1f05facc7455c82f5adb8b..8b4bd784a1836477f62fdfaf38bc9c22776269ac 100644
--- a/libavcodec/bmvaudio.c
+++ b/libavcodec/bmvaudio.c
@@ -87,5 +87,5 @@ AVCodec ff_bmv_audio_decoder = {
.id = AV_CODEC_ID_BMV_AUDIO,
.init = bmv_aud_decode_init,
.decode = bmv_aud_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/bmvvideo.c b/libavcodec/bmvvideo.c
index ebc8e7a082f46d28f0e8ddc2b2a321c05c288fb1..f4b8f29f55e4b9d1f58d4772b25f2e5f7ec0eae2 100644
--- a/libavcodec/bmvvideo.c
+++ b/libavcodec/bmvvideo.c
@@ -289,5 +289,5 @@ AVCodec ff_bmv_video_decoder = {
.priv_data_size = sizeof(BMVDecContext),
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/brenderpix.c b/libavcodec/brenderpix.c
index 25aebed7d7b6b87bfbc3f853f52c6fb1df7edd1e..a4b4c874c42a2324a00f65266d7ca8fa9892b792 100644
--- a/libavcodec/brenderpix.c
+++ b/libavcodec/brenderpix.c
@@ -290,5 +290,5 @@ AVCodec ff_brender_pix_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_BRENDER_PIX,
.decode = pix_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/c93.c b/libavcodec/c93.c
index 2729ee8fcbb05390dac077da3fb7a350dc220d70..18df9586d0a9afea40d37745e4a82e10b15b46e1 100644
--- a/libavcodec/c93.c
+++ b/libavcodec/c93.c
@@ -260,5 +260,5 @@ AVCodec ff_c93_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c
index cf21a8bb0398552766be43420959d2f8a490bf66..51b88785019e3cb8be8bb15ac86c330166e84786 100644
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@ -1202,6 +1202,6 @@ AVCodec ff_cavs_decoder = {
.init = ff_cavs_init,
.close = ff_cavs_end,
.decode = cavs_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
.flush = cavs_flush,
};
diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c
index c3e42e750a1eed16feca53e5b1f01440a83e6d13..3b68f452f4151b5dac969a84d7b7e518a816e9c5 100644
--- a/libavcodec/cdgraphics.c
+++ b/libavcodec/cdgraphics.c
@@ -372,5 +372,5 @@ AVCodec ff_cdgraphics_decoder = {
.init = cdg_decode_init,
.close = cdg_decode_end,
.decode = cdg_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/cdxl.c b/libavcodec/cdxl.c
index e45e722be59f7640bd1f0ebc7ab7907b7ad28a97..0b4aa29ce41b066b0caaab7eaf153333a498a22b 100644
--- a/libavcodec/cdxl.c
+++ b/libavcodec/cdxl.c
@@ -296,5 +296,5 @@ AVCodec ff_cdxl_decoder = {
.init = cdxl_decode_init,
.close = cdxl_decode_end,
.decode = cdxl_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 3a740b22c1a1c1072585b9151c757a617ef98297..a3ca8174797019cf6c859c04e68f0b015c98c479 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -477,5 +477,5 @@ AVCodec ff_cinepak_decoder = {
.init = cinepak_decode_init,
.close = cinepak_decode_end,
.decode = cinepak_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/cljrdec.c b/libavcodec/cljrdec.c
index e74d1fafa461ae756564f0897be580936482492d..33d8023429bf20abedb7f5c7ab716af708192389 100644
--- a/libavcodec/cljrdec.c
+++ b/libavcodec/cljrdec.c
@@ -91,5 +91,5 @@ AVCodec ff_cljr_decoder = {
.id = AV_CODEC_ID_CLJR,
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c
index 578299fcae19dbcb34f57d7ab8a0654b576ad3b1..cdbed74474e30593880d95ca1b212968db4f3813 100644
--- a/libavcodec/cllc.c
+++ b/libavcodec/cllc.c
@@ -503,5 +503,5 @@ AVCodec ff_cllc_decoder = {
.init = cllc_decode_init,
.decode = cllc_decode_frame,
.close = cllc_decode_close,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/cngdec.c b/libavcodec/cngdec.c
index 89f5c81f106cd3b6ab65635eb3a55645e50716ca..482ef94a3289d987060dc3fe364c7a55fb2d7143 100644
--- a/libavcodec/cngdec.c
+++ b/libavcodec/cngdec.c
@@ -169,5 +169,5 @@ AVCodec ff_comfortnoise_decoder = {
.close = cng_decode_close,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index d122041f26834b199d5edc4319d6445a7b5faf92..2bc0abfce3d7c045f7dd0e0ab68855ee81d08424 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -1263,7 +1263,7 @@ AVCodec ff_cook_decoder = {
.init = cook_decode_init,
.close = cook_decode_close,
.decode = cook_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c
index 358240b7a91c3ff176a1b199c2ce1d1eb785457b..0cb375b60d93142a3ae7ac5c12b9c39a2feca7de 100644
--- a/libavcodec/cscd.c
+++ b/libavcodec/cscd.c
@@ -256,5 +256,5 @@ AVCodec ff_cscd_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c
index f628ba1828c9ae95a7ace3226a23ab6625ce8774..c8d4ed304502dc4bf2bbc110dd8fc7da36e8a779 100644
--- a/libavcodec/cyuv.c
+++ b/libavcodec/cyuv.c
@@ -172,7 +172,7 @@ AVCodec ff_aura_decoder = {
.priv_data_size = sizeof(CyuvDecodeContext),
.init = cyuv_decode_init,
.decode = cyuv_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
@@ -185,6 +185,6 @@ AVCodec ff_cyuv_decoder = {
.priv_data_size = sizeof(CyuvDecodeContext),
.init = cyuv_decode_init,
.decode = cyuv_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index ece6d5c8841659e96ab36b8c1ab0d5396be27c7e..8fdd03cf7afd6ed56974757324630ffc1e020081 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -1577,7 +1577,7 @@ AVCodec ff_dca_decoder = {
.init = dca_decode_init,
.decode = dca_decode_frame,
.close = dca_decode_end,
- .capabilities = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
.profiles = NULL_IF_CONFIG_SMALL(profiles),
diff --git a/libavcodec/dds.c b/libavcodec/dds.c
index f124d4a13d2b6bf9d029f4d71242a952febd05d9..04b1dd2de8cc5bb5531da0fb5535e746e0d6521f 100644
--- a/libavcodec/dds.c
+++ b/libavcodec/dds.c
@@ -694,6 +694,6 @@ AVCodec ff_dds_decoder = {
.id = AV_CODEC_ID_DDS,
.decode = dds_decode,
.priv_data_size = sizeof(DDSContext),
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE
};
diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c
index 6fa4edc4005c32cf0595831e4ec4147efdd4402e..80211938947953f4e59403fbbae8954e83629ffb 100644
--- a/libavcodec/dfa.c
+++ b/libavcodec/dfa.c
@@ -404,5 +404,5 @@ AVCodec ff_dfa_decoder = {
.init = dfa_decode_init,
.close = dfa_decode_end,
.decode = dfa_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index b3d9161c75524b5d736416c96aed700c6a422bde..72f63e06e70abe1f539a384708a86a2c96b8da4b 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -474,5 +474,5 @@ AVCodec ff_dnxhd_decoder = {
.init = dnxhd_decode_init,
.close = dnxhd_decode_close,
.decode = dnxhd_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 0c36666d007dd7caf465f3320866984f471072e1..228ee4671c4d70ffcac90c29aaf928e778733228 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -1152,7 +1152,7 @@ AVCodec ff_dnxhd_encoder = {
.init = dnxhd_encode_init,
.encode2 = dnxhd_encode_picture,
.close = dnxhd_encode_end,
- .capabilities = CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_SLICE_THREADS,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV422P,
AV_PIX_FMT_YUV422P10,
diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c
index 5ab2331601df571f4d0550c865caadbce1a0973f..b9f5b93ebcb94a2a21d54a1b6ffd097c5ae46dd5 100644
--- a/libavcodec/dpcm.c
+++ b/libavcodec/dpcm.c
@@ -333,7 +333,7 @@ AVCodec ff_ ## name_ ## _decoder = { \
.priv_data_size = sizeof(DPCMContext), \
.init = dpcm_decode_init, \
.decode = dpcm_decode_frame, \
- .capabilities = CODEC_CAP_DR1, \
+ .capabilities = AV_CODEC_CAP_DR1, \
}
DPCM_DECODER(AV_CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "DPCM Interplay");
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index c79638768169d281212baff784738ce788eb0bfb..d4effa4c4857a1f0a4f9258b7a92aebccae67beb 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -215,5 +215,5 @@ AVCodec ff_dpx_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_DPX,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/dsicinaudio.c b/libavcodec/dsicinaudio.c
index 969e4ae1959c57f626d0a62a518425b98c4c8a16..e0fecbeb031dc93d7f6d116e190c6dce5182e1a9 100644
--- a/libavcodec/dsicinaudio.c
+++ b/libavcodec/dsicinaudio.c
@@ -131,5 +131,5 @@ AVCodec ff_dsicinaudio_decoder = {
.priv_data_size = sizeof(CinAudioContext),
.init = cinaudio_decode_init,
.decode = cinaudio_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/dsicinvideo.c b/libavcodec/dsicinvideo.c
index b56a581ea3bbcc71cc365af66a799591fdbafdbf..7c62dcf15b34bef279e47fe15adccf0953a04d33 100644
--- a/libavcodec/dsicinvideo.c
+++ b/libavcodec/dsicinvideo.c
@@ -297,5 +297,5 @@ AVCodec ff_dsicinvideo_decoder = {
.init = cinvideo_decode_init,
.close = cinvideo_decode_end,
.decode = cinvideo_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/dss_sp.c b/libavcodec/dss_sp.c
index 5862fd4d15e47eedbcff1df263870aaadc5a800a..16b738b7a9ed47b3ceb69fdc5c2d2422f3443f74 100644
--- a/libavcodec/dss_sp.c
+++ b/libavcodec/dss_sp.c
@@ -776,5 +776,5 @@ AVCodec ff_dss_sp_decoder = {
.priv_data_size = sizeof(DssSpContext),
.init = dss_sp_decode_init,
.decode = dss_sp_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index 92f557fdb6afbad251b391caa099171c47aff5b2..daa8d19ebece496943b8e7fa2ba83f3662a5c08a 100644
--- a/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@ -415,5 +415,5 @@ AVCodec ff_dvvideo_decoder = {
.priv_data_size = sizeof(DVVideoContext),
.init = dvvideo_decode_init,
.decode = dvvideo_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS,
};
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c
index 2f0a499eb39b317580cd6c9727c8a47e1f4fc8f6..85e274108222f983a703d1ad0ea08a2c8712fd51 100644
--- a/libavcodec/dvenc.c
+++ b/libavcodec/dvenc.c
@@ -745,7 +745,7 @@ AVCodec ff_dvvideo_encoder = {
.priv_data_size = sizeof(DVVideoContext),
.init = dvvideo_encode_init,
.encode2 = dvvideo_encode_frame,
- .capabilities = CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_SLICE_THREADS,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV422P,
AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index 989fcb965bf73f3e3c39a2dcfe2f977a0aa50119..b80493580d03285e4515d24182e6542d15dac0c6 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -336,5 +336,5 @@ AVCodec ff_dxa_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 662cd9f89d28d49e69ea5a6385e2517f626a3ee1..23a3c6fd157aedb8e079f4afccee974625783c15 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -751,5 +751,5 @@ AVCodec ff_dxtory_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_DXTORY,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index c5ce9a5a8761b9b9eb4582e586d4332a7dd2da4a..9668f64fbf84bf65699498333bef7790569fd5f7 100644
--- a/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
@@ -240,5 +240,5 @@ AVCodec ff_eacmv_decoder = {
.init = cmv_decode_init,
.close = cmv_decode_end,
.decode = cmv_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c
index cf24ba683a8d1ac0c593709964af77eb81e0c89a..8f7dd25d81f75336528e04ad4c6da874dbca0bbc 100644
--- a/libavcodec/eamad.c
+++ b/libavcodec/eamad.c
@@ -333,5 +333,5 @@ AVCodec ff_eamad_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c
index 1f40fe8af70e657d99618783171e9c401f7dec13..a0496a00cb48acdbe8547c41fb97cf5c6a1855da 100644
--- a/libavcodec/eatgq.c
+++ b/libavcodec/eatgq.c
@@ -247,5 +247,5 @@ AVCodec ff_eatgq_decoder = {
.priv_data_size = sizeof(TgqContext),
.init = tgq_decode_init,
.decode = tgq_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index a77c4c3886d9088daca5912b19199175c4599cbe..4faae50a1824a798d8fce142fa9f660f3fdc36ab 100644
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -357,5 +357,5 @@ AVCodec ff_eatgv_decoder = {
.init = tgv_decode_init,
.close = tgv_decode_end,
.decode = tgv_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c
index dc360ce51cb2769712730a6aa8c3a35229c48de8..f5dcb5369267fc2afa53889bcf39752777126a01 100644
--- a/libavcodec/eatqi.c
+++ b/libavcodec/eatqi.c
@@ -163,5 +163,5 @@ AVCodec ff_eatqi_decoder = {
.init = tqi_decode_init,
.close = tqi_decode_end,
.decode = tqi_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c
index 6c4654cd351b9620086a3737de67ba0ca64501ad..f652198e5b1d1925ce96a981333b8c34727fa4b3 100644
--- a/libavcodec/escape124.c
+++ b/libavcodec/escape124.c
@@ -380,5 +380,5 @@ AVCodec ff_escape124_decoder = {
.init = escape124_decode_init,
.close = escape124_decode_close,
.decode = escape124_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c
index 22833d638ba576ed38995ba0c06b6f43db9dde5b..f134138f772b957dff644d0dac771b0b791fd89a 100644
--- a/libavcodec/escape130.c
+++ b/libavcodec/escape130.c
@@ -352,5 +352,5 @@ AVCodec ff_escape130_decoder = {
.init = escape130_decode_init,
.close = escape130_decode_close,
.decode = escape130_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 327a60e3355e064d3d09691588acc6d982d9be18..cdcdd7cc6c1858b8cf49414f9e0c04e8fb72ce8e 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -1446,7 +1446,7 @@ AVCodec ff_exr_decoder = {
.init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy),
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS |
- CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS |
+ AV_CODEC_CAP_SLICE_THREADS,
.priv_class = &exr_class,
};
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index c46bcf2681250e47c4ca79beb4834a9b6075aede..01c58a14ca62305888908945b50e8e7b1aaddbec 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -958,6 +958,6 @@ AVCodec ff_ffv1_decoder = {
.init = ffv1_decode_init,
.close = ffv1_decode_close,
.decode = ffv1_decode_frame,
- .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/ |
- CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/ |
+ AV_CODEC_CAP_SLICE_THREADS,
};
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index cd28adb7535cc94d78c4a10d15e7994ef8fe7806..08e59de763a1815cb38e331b39f463e83b06e8eb 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -1098,7 +1098,7 @@ AVCodec ff_ffv1_encoder = {
.init = ffv1_encode_init,
.encode2 = ffv1_encode_frame,
.close = ffv1_encode_close,
- .capabilities = CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_SLICE_THREADS,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P,
AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P,
diff --git a/libavcodec/fic.c b/libavcodec/fic.c
index 8512ef3400f02797151d6539d61229b321879248..b1286ebe6536242fa58c7ade6fdabbe200640ded 100644
--- a/libavcodec/fic.c
+++ b/libavcodec/fic.c
@@ -454,5 +454,5 @@ AVCodec ff_fic_decoder = {
.init = fic_decode_init,
.decode = fic_decode_frame,
.close = fic_decode_close,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS,
};
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 6cce6923f310bb6260a315e870c827002313ff96..7af71f3c0c0de3e664a058c8ae52128458eca2f3 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -562,7 +562,7 @@ AVCodec ff_flac_decoder = {
.init = flac_decode_init,
.close = flac_decode_close,
.decode = flac_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_S32,
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 804333d5e9cbdb2056e22413557058b7f4ed4133..c4c60ee57334ed947ca0186dae6f27855d4d1f86 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -1343,7 +1343,7 @@ AVCodec ff_flac_encoder = {
.init = flac_encode_init,
.encode2 = flac_encode_frame,
.close = flac_encode_close,
- .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_S32,
AV_SAMPLE_FMT_NONE },
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index a5b12941659d534f195c16d4e8f39f6262496da9..ee854acd5c95308f39b709821c477f01099954f4 100644
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -493,7 +493,7 @@ AVCodec ff_flashsv_decoder = {
.init = flashsv_decode_init,
.close = flashsv_decode_end,
.decode = flashsv_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
};
#endif /* CONFIG_FLASHSV_DECODER */
@@ -556,7 +556,7 @@ AVCodec ff_flashsv2_decoder = {
.init = flashsv2_decode_init,
.close = flashsv2_decode_end,
.decode = flashsv_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
};
#endif /* CONFIG_FLASHSV2_DECODER */
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index 91bd7997b2548aef924aeaadfc62f715e1204500..3a595435b00662f0db0f83fb8d299d50120ba09e 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -750,5 +750,5 @@ AVCodec ff_flic_decoder = {
.init = flic_decode_init,
.close = flic_decode_end,
.decode = flic_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c
index 71617947bbcbc5eb8b20460bb0a11c7a963f9de8..f2d49294c6e89cea30aa89d1fdba6ffdc404afd4 100644
--- a/libavcodec/flvdec.c
+++ b/libavcodec/flvdec.c
@@ -129,7 +129,7 @@ AVCodec ff_flv_decoder = {
.init = ff_h263_decode_init,
.close = ff_h263_decode_end,
.decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE },
};
diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c
index 4b4b02cc51ddffcc6aef3dc30a383b429020368a..7b198254d9a93c84b4911057b13a7c9123c9f597 100644
--- a/libavcodec/fraps.c
+++ b/libavcodec/fraps.c
@@ -382,5 +382,5 @@ AVCodec ff_fraps_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/frwu.c b/libavcodec/frwu.c
index 568b94f81b5966276eac9869d84a3dfaa89bdce2..61cd3156be0335e096dde63cb7f788a4507b43ba 100644
--- a/libavcodec/frwu.c
+++ b/libavcodec/frwu.c
@@ -101,5 +101,5 @@ AVCodec ff_frwu_decoder = {
.id = AV_CODEC_ID_FRWU,
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index af27a5da836d8be78084c09510a331a9448a4e40..21d7bb4da61dd7b5a73bd69c9047b2e302c38d07 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -1612,6 +1612,6 @@ AVCodec ff_g2m_decoder = {
.init = g2m_decode_init,
.close = g2m_decode_end,
.decode = g2m_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c
index a1b3aa78c98161326f92e7a017431467818307c4..c4c0ec8feefe1ad30c0bbcde018516f386af0f16 100644
--- a/libavcodec/g722dec.c
+++ b/libavcodec/g722dec.c
@@ -147,6 +147,6 @@ AVCodec ff_adpcm_g722_decoder = {
.priv_data_size = sizeof(G722Context),
.init = g722_decode_init,
.decode = g722_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.priv_class = &g722_decoder_class,
};
diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c
index 39436221371e7b36865faf1c343fc7a15e96ddd8..545825b057e5741bd065d0ca39280d3b2be06c7e 100644
--- a/libavcodec/g722enc.c
+++ b/libavcodec/g722enc.c
@@ -390,7 +390,7 @@ AVCodec ff_adpcm_g722_encoder = {
.init = g722_encode_init,
.close = g722_encode_close,
.encode2 = g722_encode_frame,
- .capabilities = CODEC_CAP_SMALL_LAST_FRAME,
+ .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c
index f3879bdbcd8fcec2e222215c8a877d0d6fdc084f..4904e52ac07255662372f67cc3d2aeaa6b5731be 100644
--- a/libavcodec/g723_1.c
+++ b/libavcodec/g723_1.c
@@ -1373,6 +1373,6 @@ AVCodec ff_g723_1_decoder = {
.priv_data_size = sizeof(G723_1_Context),
.init = g723_1_decode_init,
.decode = g723_1_decode_frame,
- .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1,
.priv_class = &g723_1dec_class,
};
diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index b877687384788a55af8e0eb139a065dc468154f6..4a23ff78a479bd1aa0ea6f4a98626499d546850b 100644
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -393,7 +393,7 @@ AVCodec ff_adpcm_g726_encoder = {
.priv_data_size = sizeof(G726Context),
.init = g726_encode_init,
.encode2 = g726_encode_frame,
- .capabilities = CODEC_CAP_SMALL_LAST_FRAME,
+ .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
.priv_class = &class,
@@ -470,6 +470,6 @@ AVCodec ff_adpcm_g726_decoder = {
.init = g726_decode_init,
.decode = g726_decode_frame,
.flush = g726_decode_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c
index d91f159dc1640d00f0d508d11e8d129aae9c6ce7..f08d5011132f2768e50699135af2c6b3295841a8 100644
--- a/libavcodec/gifdec.c
+++ b/libavcodec/gifdec.c
@@ -323,5 +323,5 @@ AVCodec ff_gif_decoder = {
.init = gif_decode_init,
.close = gif_decode_close,
.decode = gif_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c
index b763ce8a584545313ff90320df30c91562b2e768..a333e58bdc282b540a09ff19daa3f57911d7c6a8 100644
--- a/libavcodec/gsmdec.c
+++ b/libavcodec/gsmdec.c
@@ -121,7 +121,7 @@ AVCodec ff_gsm_decoder = {
.init = gsm_init,
.decode = gsm_decode_frame,
.flush = gsm_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
AVCodec ff_gsm_ms_decoder = {
@@ -133,5 +133,5 @@ AVCodec ff_gsm_ms_decoder = {
.init = gsm_init,
.decode = gsm_decode_frame,
.flush = gsm_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index 8e97309c723f7645ee2371d58cf0e3a7041b3794..95452f47b4ab1e6c3e11472664aff999d7c2566a 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -664,5 +664,5 @@ AVCodec ff_h261_decoder = {
.init = h261_decode_init,
.close = h261_decode_end,
.decode = h261_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index cdf6c572edfaf9257e15e34e74ce52162becc75f..3a0f4f76c704a4e928c6672a1642b6b915e3d834 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -673,8 +673,8 @@ AVCodec ff_h263_decoder = {
.init = ff_h263_decode_init,
.close = ff_h263_decode_end,
.decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 |
- CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 |
+ AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY,
.flush = ff_mpeg_flush,
.pix_fmts = ff_h263_hwaccel_pixfmt_list_420,
};
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 511077e4072e3539990c259423067a4eb2ef0e00..6693d47b7d0dcd6b69cbaf6b84e1d494282c05ad 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1798,9 +1798,9 @@ AVCodec ff_h264_decoder = {
.init = ff_h264_decode_init,
.close = h264_decode_end,
.decode = h264_decode_frame,
- .capabilities = /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 |
- CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS |
- CODEC_CAP_FRAME_THREADS,
+ .capabilities = /*AV_CODEC_CAP_DRAW_HORIZ_BAND |*/ AV_CODEC_CAP_DR1 |
+ AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS |
+ AV_CODEC_CAP_FRAME_THREADS,
.flush = flush_dpb,
.init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy),
.update_thread_context = ONLY_IF_THREADS_ENABLED(ff_h264_update_thread_context),
diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c
index 0398efe6cabea09809a0c5055666126e810e6a16..71f7db53998d493e08d1c02de218bd3f6680c71b 100644
--- a/libavcodec/hapdec.c
+++ b/libavcodec/hapdec.c
@@ -261,8 +261,8 @@ AVCodec ff_hap_decoder = {
.decode = hap_decode,
.close = hap_close,
.priv_data_size = sizeof(HapContext),
- .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS |
- CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS |
+ AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP,
};
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 25e706f6b01e7f94178f070167f88b87ea68eb27..0dfe7a29d66127f190cfa49f5aab28d7b0dbd282 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -3060,7 +3060,7 @@ AVCodec ff_hevc_decoder = {
.flush = hevc_decode_flush,
.update_thread_context = hevc_update_thread_context,
.init_thread_copy = hevc_init_thread_copy,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY |
- CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY |
+ AV_CODEC_CAP_FRAME_THREADS,
.profiles = NULL_IF_CONFIG_SMALL(profiles),
};
diff --git a/libavcodec/hnm4video.c b/libavcodec/hnm4video.c
index 700504d87cbc27f07849dd366b21dd29fcf0e88f..1dc6ed3baced41b73c0b7d1c9f0630d66a68d809 100644
--- a/libavcodec/hnm4video.c
+++ b/libavcodec/hnm4video.c
@@ -461,5 +461,5 @@ AVCodec ff_hnm4_video_decoder = {
.init = hnm_decode_init,
.close = hnm_decode_end,
.decode = hnm_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c
index 4871c59c83738e7cd456710358e88097531b11db..c63e5a8e5572dbeac6ba01787325903b8b503dd3 100644
--- a/libavcodec/hq_hqa.c
+++ b/libavcodec/hq_hqa.c
@@ -384,7 +384,7 @@ AVCodec ff_hq_hqa_decoder = {
.init = hq_hqa_decode_init,
.decode = hq_hqa_decode_frame,
.close = hq_hqa_decode_close,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP,
};
diff --git a/libavcodec/hqx.c b/libavcodec/hqx.c
index 11b872cbb363f19c670bc96ad786e73437ca2122..34e36056c76162407f13a84b890bb2145eff3789 100644
--- a/libavcodec/hqx.c
+++ b/libavcodec/hqx.c
@@ -538,7 +538,7 @@ AVCodec ff_hqx_decoder = {
.init = hqx_decode_init,
.decode = hqx_decode_frame,
.close = hqx_decode_close,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP,
};
diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index 5d820fc1dccfbcd3a0995c24b1b6c75186d9fc27..3e73ed4d86bef2f94cae9ba87133e2cbbc3060e7 100644
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -792,8 +792,8 @@ AVCodec ff_huffyuv_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND |
- CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DRAW_HORIZ_BAND |
+ AV_CODEC_CAP_FRAME_THREADS,
.init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy),
};
@@ -807,8 +807,8 @@ AVCodec ff_ffvhuff_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND |
- CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DRAW_HORIZ_BAND |
+ AV_CODEC_CAP_FRAME_THREADS,
.init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy),
};
#endif /* CONFIG_FFVHUFF_DECODER */
diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c
index 87a10139667a38d9f3b16ff4d9423e694d4a992b..1a5a1c3a258b6c51e26cd8571afdfe16788bc755 100644
--- a/libavcodec/idcinvideo.c
+++ b/libavcodec/idcinvideo.c
@@ -247,5 +247,5 @@ AVCodec ff_idcin_decoder = {
.priv_data_size = sizeof(IdcinContext),
.init = idcin_decode_init,
.decode = idcin_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 92c376446237c742835356b47ea1e0ffb16faed5..6d9ac9397187f7a275dda681f9ba81eaf8472f41 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -382,7 +382,7 @@ AVCodec ff_iff_ilbm_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame_ilbm,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
AVCodec ff_iff_byterun1_decoder = {
@@ -394,5 +394,5 @@ AVCodec ff_iff_byterun1_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame_byterun1,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index 6dcb765dda2de6ee8e96e880923bf7a446945b54..d2c96da1668b81ee4d31047ca100e4e6421218c5 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -1054,7 +1054,7 @@ AVCodec ff_imc_decoder = {
.init = imc_decode_init,
.close = imc_decode_close,
.decode = imc_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
};
@@ -1068,7 +1068,7 @@ AVCodec ff_iac_decoder = {
.init = imc_decode_init,
.close = imc_decode_close,
.decode = imc_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index 4221e9e9e4e21d20c90ea18f0094b8d29658574c..7b355f39b98cfb75ffacf3f018685fd06638b158 100644
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -256,5 +256,5 @@ AVCodec ff_indeo2_decoder = {
.init = ir2_decode_init,
.close = ir2_decode_end,
.decode = ir2_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index 33239eb9f8b9b455e1f65d9af9f10979afc5819c..5a0d3a7d4bb0a089bcd69c956591cd4d4e7d97e1 100644
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@@ -1134,5 +1134,5 @@ AVCodec ff_indeo3_decoder = {
.init = decode_init,
.close = decode_close,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index 1fd45f0790638967fede03566c3c628db2da8617..64ed8cd5816817358beb35683564da3197d2c836 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -661,5 +661,5 @@ AVCodec ff_indeo4_decoder = {
.init = decode_init,
.close = ff_ivi_decode_close,
.decode = ff_ivi_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index 2d00c236047862523e6cb5f3b82803a091d2aae2..bed915370ad1cee9e0f3016238ef8ee4f75e455c 100644
--- a/libavcodec/indeo5.c
+++ b/libavcodec/indeo5.c
@@ -657,5 +657,5 @@ AVCodec ff_indeo5_decoder = {
.init = decode_init,
.close = ff_ivi_decode_close,
.decode = ff_ivi_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c
index 3f37489aa91d368f4e312714a254ba288935650d..51160d0b0c473745b28f9124e25c3da68ef1cdfe 100644
--- a/libavcodec/intelh263dec.c
+++ b/libavcodec/intelh263dec.c
@@ -138,7 +138,7 @@ AVCodec ff_h263i_decoder = {
.init = ff_h263_decode_init,
.close = ff_h263_decode_end,
.decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index d681fdf72e028aa60da28b7ccdc45c3bd606e0de..f0a770a51923e0b1870abec4178e2f1a90e475e5 100644
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -1020,5 +1020,5 @@ AVCodec ff_interplay_video_decoder = {
.init = ipvideo_decode_init,
.close = ipvideo_decode_end,
.decode = ipvideo_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_PARAM_CHANGE,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_PARAM_CHANGE,
};
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 314529969abd8cc7385a099fe09c731b0ae29487..6946975fb84f9ac791443e03340670db07677893 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1470,7 +1470,7 @@ AVCodec ff_jpeg2000_decoder = {
.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_JPEG2000,
- .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_DR1,
.priv_data_size = sizeof(Jpeg2000DecoderContext),
.init_static_data = jpeg2000_init_static_data,
.init = jpeg2000_decode_init,
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index 3b93799f859266f8d61fd68d051f0dd5961b480a..9f8ccecec6c2720e7c51da7b630a93bc5a77aed8 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -402,6 +402,6 @@ AVCodec ff_jpegls_decoder = {
.init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end,
.decode = ff_mjpeg_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c
index 2a7aa102548e8909050bc22a32130e663637e947..c532b75a259853ae471908f6ca3391fd18c0d665 100644
--- a/libavcodec/jvdec.c
+++ b/libavcodec/jvdec.c
@@ -228,5 +228,5 @@ AVCodec ff_jv_decoder = {
.init = decode_init,
.close = decode_close,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c
index 4035e472f343c5bda1ec249741f0bcbef735e819..0bf322eabcef632bac433d308b6f83b4f849ea82 100644
--- a/libavcodec/kgv1dec.c
+++ b/libavcodec/kgv1dec.c
@@ -196,5 +196,5 @@ AVCodec ff_kgv1_decoder = {
.close = decode_end,
.decode = decode_frame,
.flush = decode_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c
index 5da8bb27cc8f27af1f8559ca3347c9dae8b59c83..ca6b79fa7c5db9c45b2b6af37b1aa69dfaea30a3 100644
--- a/libavcodec/kmvc.c
+++ b/libavcodec/kmvc.c
@@ -406,5 +406,5 @@ AVCodec ff_kmvc_decoder = {
.priv_data_size = sizeof(KmvcContext),
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c
index e9b00982d3e024ae2abff98ea11bebdfbef176c6..98765fd49157c5688254b814c82f24fbf8137d62 100644
--- a/libavcodec/lagarith.c
+++ b/libavcodec/lagarith.c
@@ -703,5 +703,5 @@ AVCodec ff_lagarith_decoder = {
.init = lag_decode_init,
.close = lag_decode_end,
.decode = lag_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
};
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 9c606976e70e8a493dda96a792ce982c4e250cf5..ac13a1964d32fda70a7f5509bf0492621397e90f 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -635,7 +635,7 @@ AVCodec ff_mszh_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
@@ -649,6 +649,6 @@ AVCodec ff_zlib_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
diff --git a/libavcodec/libdcadec.c b/libavcodec/libdcadec.c
index 3ab3b1a6524a21dc3801380ac4462b2dc3f3c63d..9d983e8fbbe7da9b40cf15bebb40db6029df4ee5 100644
--- a/libavcodec/libdcadec.c
+++ b/libavcodec/libdcadec.c
@@ -198,7 +198,7 @@ AVCodec ff_libdcadec_decoder = {
.decode = dcadec_decode_frame,
.close = dcadec_close,
.flush = dcadec_flush,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_CHANNEL_CONF,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE },
.profiles = NULL_IF_CONFIG_SMALL(profiles),
diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c
index 6d3742e314bf9d80830277826f8a13f840b6f311..2d8564f89affd3e0383f6056b96093a365b2aae1 100644
--- a/libavcodec/libfaac.c
+++ b/libavcodec/libfaac.c
@@ -232,7 +232,7 @@ AVCodec ff_libfaac_encoder = {
.init = Faac_encode_init,
.encode2 = Faac_encode_frame,
.close = Faac_encode_close,
- .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
.profiles = NULL_IF_CONFIG_SMALL(profiles),
diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
index f789b75bfe64f9dd0b05ab080f2a48178a8bac51..e893ee381e94dc6d76d80948b009738ec6e4f775 100644
--- a/libavcodec/libfdk-aacdec.c
+++ b/libavcodec/libfdk-aacdec.c
@@ -419,6 +419,6 @@ AVCodec ff_libfdk_aac_decoder = {
.decode = fdk_aac_decode_frame,
.close = fdk_aac_decode_close,
.flush = fdk_aac_decode_flush,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_CHANNEL_CONF,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF,
.priv_class = &fdk_aac_dec_class,
};
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
index 2682a755eb500ad298d828e6b6d6951bbd733a4f..2413c71f2c210c8d42c33bb452c18e7a6e6370e9 100644
--- a/libavcodec/libfdk-aacenc.c
+++ b/libavcodec/libfdk-aacenc.c
@@ -419,7 +419,7 @@ AVCodec ff_libfdk_aac_encoder = {
.init = aac_encode_init,
.encode2 = aac_encode_frame,
.close = aac_encode_close,
- .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
.priv_class = &aac_enc_class,
diff --git a/libavcodec/libgsmdec.c b/libavcodec/libgsmdec.c
index da95cc7185e17bb6f3f0849dbf5804520da34d6e..4c21ff672858e7cfe02dd1ba8f317052a2eccaff 100644
--- a/libavcodec/libgsmdec.c
+++ b/libavcodec/libgsmdec.c
@@ -134,7 +134,7 @@ AVCodec ff_libgsm_decoder = {
.close = libgsm_decode_close,
.decode = libgsm_decode_frame,
.flush = libgsm_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
AVCodec ff_libgsm_ms_decoder = {
@@ -147,5 +147,5 @@ AVCodec ff_libgsm_ms_decoder = {
.close = libgsm_decode_close,
.decode = libgsm_decode_frame,
.flush = libgsm_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c
index af693bd7289ac52054039ce245606d2416553b5c..c5053f012b5e3bd760a97ec1d2797c098641806f 100644
--- a/libavcodec/libilbc.c
+++ b/libavcodec/libilbc.c
@@ -111,7 +111,7 @@ AVCodec ff_libilbc_decoder = {
.priv_data_size = sizeof(ILBCDecContext),
.init = ilbc_decode_init,
.decode = ilbc_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.priv_class = &ilbc_dec_class,
};
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c
index 8337da5e78416431438b7d89f524229b72885bc2..966212dcae8146cbaf44303ba1df6f063122536b 100644
--- a/libavcodec/libmp3lame.c
+++ b/libavcodec/libmp3lame.c
@@ -303,7 +303,7 @@ AVCodec ff_libmp3lame_encoder = {
.init = mp3lame_encode_init,
.encode2 = mp3lame_encode_frame,
.close = mp3lame_encode_close,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SMALL_LAST_FRAME,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S32P,
AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_S16P,
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
index ac6976f3e29d5f96e754934c0be00ba3ae60ad19..763d80f2009bcba99f9a59f9bbb7ace236762d33 100644
--- a/libavcodec/libopencore-amr.c
+++ b/libavcodec/libopencore-amr.c
@@ -136,7 +136,7 @@ AVCodec ff_libopencore_amrnb_decoder = {
.init = amr_nb_decode_init,
.close = amr_nb_decode_close,
.decode = amr_nb_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif /* CONFIG_LIBOPENCORE_AMRNB_DECODER */
@@ -290,7 +290,7 @@ AVCodec ff_libopencore_amrnb_encoder = {
.init = amr_nb_encode_init,
.encode2 = amr_nb_encode_frame,
.close = amr_nb_encode_close,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SMALL_LAST_FRAME,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
.priv_class = &class,
@@ -373,7 +373,7 @@ AVCodec ff_libopencore_amrwb_decoder = {
.init = amr_wb_decode_init,
.close = amr_wb_decode_close,
.decode = amr_wb_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif /* CONFIG_LIBOPENCORE_AMRWB_DECODER */
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
index c0f471f7e18b031700a1f2e77e739661859f64cf..9ac33e2ba1ed42c17ea99064940ca901770375e4 100644
--- a/libavcodec/libopenh264enc.c
+++ b/libavcodec/libopenh264enc.c
@@ -227,7 +227,7 @@ AVCodec ff_libopenh264_encoder = {
.init = svc_encode_init,
.encode2 = svc_encode_frame,
.close = svc_encode_close,
- .capabilities = CODEC_CAP_AUTO_THREADS,
+ .capabilities = AV_CODEC_CAP_AUTO_THREADS,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE },
.priv_class = &class,
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index 73b1b9f71edb5fd52b873cd01d677c8cb403faf6..3da6eeceb250e7882e7c16778b9e617f1710ccba 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -436,6 +436,6 @@ AVCodec ff_libopenjpeg_decoder = {
.priv_data_size = sizeof(LibOpenJPEGContext),
.init = libopenjpeg_decode_init,
.decode = libopenjpeg_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
.priv_class = &class,
};
diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c
index 398450f4d45ea5963b5be7c6b79d7ba2ff788be4..2d31b039671033b5a387d4b080d431b3dd5cfff9 100644
--- a/libavcodec/libopusdec.c
+++ b/libavcodec/libopusdec.c
@@ -160,7 +160,7 @@ AVCodec ff_libopus_decoder = {
.close = libopus_decode_close,
.decode = libopus_decode,
.flush = libopus_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c
index da6194acac2f66de453ac1e5d069c748b5bd7e21..ec4e513bc6ec3103a32d575784e622b302948e36 100644
--- a/libavcodec/libopusenc.c
+++ b/libavcodec/libopusenc.c
@@ -413,7 +413,7 @@ AVCodec ff_libopus_encoder = {
.init = libopus_encode_init,
.encode2 = libopus_encode,
.close = libopus_encode_close,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SMALL_LAST_FRAME,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE },
diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c
index c61aaefafe96e4cc2da2a98f7545a422023a760f..d2594c68fed5c8694ec25fab0f365df76137b4cf 100644
--- a/libavcodec/libschroedingerdec.c
+++ b/libavcodec/libschroedingerdec.c
@@ -387,6 +387,6 @@ AVCodec ff_libschroedinger_decoder = {
.init = libschroedinger_decode_init,
.close = libschroedinger_decode_close,
.decode = libschroedinger_decode_frame,
- .capabilities = CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DELAY,
.flush = libschroedinger_flush,
};
diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c
index a79d55e6eec5d65aa33c76a7000a3e35749b9f4c..ecf5e37d5593201d192072e581a0532d7519d033 100644
--- a/libavcodec/libschroedingerenc.c
+++ b/libavcodec/libschroedingerenc.c
@@ -450,7 +450,7 @@ AVCodec ff_libschroedinger_encoder = {
.init = libschroedinger_encode_init,
.encode2 = libschroedinger_encode_frame,
.close = libschroedinger_encode_close,
- .capabilities = CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DELAY,
.pix_fmts = (const enum AVPixelFormat[]){
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE
},
diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c
index a26b763688da23423351f26c1c2146bb5afc9c26..949a9344c1ce8057947512915a7e5986cbe4f501 100644
--- a/libavcodec/libspeexdec.c
+++ b/libavcodec/libspeexdec.c
@@ -178,5 +178,5 @@ AVCodec ff_libspeex_decoder = {
.close = libspeex_decode_close,
.decode = libspeex_decode_frame,
.flush = libspeex_decode_flush,
- .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DELAY | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c
index e3aa1cfccfeba382775f3498a52d51e00e11ab99..86b1ac793cbb953e234af4e051bb29e730028986 100644
--- a/libavcodec/libspeexenc.c
+++ b/libavcodec/libspeexenc.c
@@ -357,7 +357,7 @@ AVCodec ff_libspeex_encoder = {
.init = encode_init,
.encode2 = encode_frame,
.close = encode_close,
- .capabilities = CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
.channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO,
diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
index 38e0bc71cfd3cfa5d2c73b55dcb715f7d80dc76b..9ed9a50493755b48f84122278e11be0835af4f82 100644
--- a/libavcodec/libtheoraenc.c
+++ b/libavcodec/libtheoraenc.c
@@ -378,7 +378,7 @@ AVCodec ff_libtheora_encoder = {
.init = encode_init,
.close = encode_close,
.encode2 = encode_frame,
- .capabilities = CODEC_CAP_DELAY, // needed to get the statsfile summary
+ .capabilities = AV_CODEC_CAP_DELAY, // needed to get the statsfile summary
.pix_fmts = (const enum AVPixelFormat[]){
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE
},
diff --git a/libavcodec/libtwolame.c b/libavcodec/libtwolame.c
index 9c0e4c52ec037b46d3c7dcec0335cee06381bc1f..714c30acdee9a8c81504b455f939d5cd7c825d01 100644
--- a/libavcodec/libtwolame.c
+++ b/libavcodec/libtwolame.c
@@ -207,7 +207,7 @@ AVCodec ff_libtwolame_encoder = {
.init = twolame_encode_init,
.encode2 = twolame_encode_frame,
.close = twolame_encode_close,
- .capabilities = CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DELAY,
.defaults = twolame_defaults,
.priv_class = &twolame_class,
.sample_fmts = (const enum AVSampleFormat[]) {
diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c
index 76b86ff57d74b628fbd8920705d6804051f55add..25d7718314a74e89f901910a7e174668bd972619 100644
--- a/libavcodec/libvo-aacenc.c
+++ b/libavcodec/libvo-aacenc.c
@@ -188,7 +188,7 @@ AVCodec ff_libvo_aacenc_encoder = {
.init = aac_encode_init,
.encode2 = aac_encode_frame,
.close = aac_encode_close,
- .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c
index 00ef9e8dba7b8e9ba348f59eae647090e7d534d3..3f1e648e972272ab310a672e60749d5df594d565 100644
--- a/libavcodec/libvorbis.c
+++ b/libavcodec/libvorbis.c
@@ -346,7 +346,7 @@ AVCodec ff_libvorbis_encoder = {
.init = libvorbis_encode_init,
.encode2 = libvorbis_encode_frame,
.close = libvorbis_encode_close,
- .capabilities = CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
.priv_class = &class,
diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c
index 47c8067179c9a0b0a850c12f71e481981691903b..28b7733969e1d9ce2627ec372641329d72f358df 100644
--- a/libavcodec/libvpxdec.c
+++ b/libavcodec/libvpxdec.c
@@ -126,7 +126,7 @@ AVCodec ff_libvpx_vp8_decoder = {
.init = vp8_init,
.close = vp8_free,
.decode = vp8_decode,
- .capabilities = CODEC_CAP_AUTO_THREADS | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_AUTO_THREADS | AV_CODEC_CAP_DR1,
};
#endif /* CONFIG_LIBVPX_VP8_DECODER */
@@ -145,6 +145,6 @@ AVCodec ff_libvpx_vp9_decoder = {
.init = vp9_init,
.close = vp8_free,
.decode = vp8_decode,
- .capabilities = CODEC_CAP_AUTO_THREADS,
+ .capabilities = AV_CODEC_CAP_AUTO_THREADS,
};
#endif /* CONFIG_LIBVPX_VP9_DECODER */
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 10758332c97dadcd28ba269fef100d9258000849..563117fe4c9edf87966d505f6c1fcedd7b7ca68f 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -622,7 +622,7 @@ AVCodec ff_libvpx_vp8_encoder = {
.init = vp8_init,
.encode2 = vp8_encode,
.close = vp8_free,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
.priv_class = &class_vp8,
.defaults = defaults,
@@ -659,7 +659,7 @@ AVCodec ff_libvpx_vp9_encoder = {
.init = vp9_init,
.encode2 = vp8_encode,
.close = vp8_free,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
#if VPX_IMAGE_ABI_VERSION >= 3
diff --git a/libavcodec/libwavpackenc.c b/libavcodec/libwavpackenc.c
index 34ec013943bfd963ecc2772138e614f29124f8e5..1455d91b218b6bf7c4af2c335155311054b79ac0 100644
--- a/libavcodec/libwavpackenc.c
+++ b/libavcodec/libwavpackenc.c
@@ -188,7 +188,7 @@ AVCodec ff_libwavpack_encoder = {
.init = wavpack_encode_init,
.encode2 = wavpack_encode_frame,
.close = wavpack_encode_close,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SMALL_LAST_FRAME,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index a4af21166e5d28af2962cd5912b7990bb7225cdf..befc47dd083261babe51dd04c3822542b686464d 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -741,7 +741,7 @@ AVCodec ff_libx264_encoder = {
.init = X264_init,
.encode2 = X264_frame,
.close = X264_close,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS,
.priv_class = &class,
.defaults = x264_defaults,
.init_static_data = X264_init_static,
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index 38465cc9885776aaf77bd360e00458c33e5a0e55..91bd83fcdc1ecd30874d1ac9e7c882fa12785a9e 100644
--- a/libavcodec/libx265.c
+++ b/libavcodec/libx265.c
@@ -378,5 +378,5 @@ AVCodec ff_libx265_encoder = {
.priv_data_size = sizeof(libx265Context),
.priv_class = &class,
.defaults = x265_defaults,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS,
};
diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c
index cfb636ffa7a74ebecde2b9e56da6b1db0dc4acc9..c9cb34f6c0f55081f5b048ef343fb48162336a76 100644
--- a/libavcodec/libxavs.c
+++ b/libavcodec/libxavs.c
@@ -463,7 +463,7 @@ AVCodec ff_libxavs_encoder = {
.init = XAVS_init,
.encode2 = XAVS_frame,
.close = XAVS_close,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
.priv_class = &class,
.defaults = xavs_defaults,
diff --git a/libavcodec/loco.c b/libavcodec/loco.c
index 6be081d8ad3ef4f78b29563d49ab9bac49caa76e..f25ef61f373463cccbfa547bd811e4ec3e1e8547 100644
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@@ -323,5 +323,5 @@ AVCodec ff_loco_decoder = {
.priv_data_size = sizeof(LOCOContext),
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/mace.c b/libavcodec/mace.c
index 25c6b703ac19431600c0172dc1866019f0b9ca26..c6eddc05daa5c2d9c8fb6b1f515e0d19bd016a48 100644
--- a/libavcodec/mace.c
+++ b/libavcodec/mace.c
@@ -287,7 +287,7 @@ AVCodec ff_mace3_decoder = {
.priv_data_size = sizeof(MACEContext),
.init = mace_decode_init,
.decode = mace_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE },
};
@@ -300,7 +300,7 @@ AVCodec ff_mace6_decoder = {
.priv_data_size = sizeof(MACEContext),
.init = mace_decode_init,
.decode = mace_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c
index af1c59a82b7872c43ad5b3863bb79a1af154f1a1..ddb9ddbbc3d686f25b2c8b12eb522ddedacbe043 100644
--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@@ -263,6 +263,6 @@ AVCodec ff_mdec_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
.init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy)
};
diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c
index dd9ffe03b0472c5fb46848e6186cbed7b52c346a..dbb2a63e3ec48972fc2618c2ccc9844e9d171973 100644
--- a/libavcodec/metasound.c
+++ b/libavcodec/metasound.c
@@ -383,7 +383,7 @@ AVCodec ff_metasound_decoder = {
.init = metasound_decode_init,
.close = ff_twinvq_decode_close,
.decode = ff_twinvq_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index 7f97366de4db75d860a2ed41aaf57edd2f9b50d3..6c4fc8ac7d07c857a261d2942ebbc5602c3a4be3 100644
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -480,7 +480,7 @@ AVCodec ff_mimic_decoder = {
.init = mimic_decode_init,
.close = mimic_decode_end,
.decode = mimic_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
.update_thread_context = ONLY_IF_THREADS_ENABLED(mimic_decode_update_thread_context),
.init_thread_copy = ONLY_IF_THREADS_ENABLED(mimic_init_thread_copy),
};
diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c
index ef1df9c08d862ae613de33c190919414a49f0bd8..3775aa3fb9cf10ec20b180a5c8866eee334dcb60 100644
--- a/libavcodec/mjpegbdec.c
+++ b/libavcodec/mjpegbdec.c
@@ -161,6 +161,6 @@ AVCodec ff_mjpegb_decoder = {
.init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end,
.decode = mjpegb_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index c28553de86776536ab59660f7604596cbb1ec7a1..da1c6d771e5e8f9d3c6a9c6636368af3a28fdf41 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1723,7 +1723,7 @@ AVCodec ff_mjpeg_decoder = {
.init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end,
.decode = ff_mjpeg_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.priv_class = &mjpegdec_class,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
@@ -1737,6 +1737,6 @@ AVCodec ff_thp_decoder = {
.init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end,
.decode = ff_mjpeg_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index a0b0b9646d7cd9a68791c373233e50c15e65c1c7..7e4140259f20557ae79eb4b26b877447ab864b2d 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -1285,7 +1285,7 @@ AVCodec ff_mlp_decoder = {
.priv_data_size = sizeof(MLPDecodeContext),
.init = mlp_decode_init,
.decode = read_access_unit,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#if CONFIG_TRUEHD_DECODER
@@ -1297,6 +1297,6 @@ AVCodec ff_truehd_decoder = {
.priv_data_size = sizeof(MLPDecodeContext),
.init = mlp_decode_init,
.decode = read_access_unit,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif /* CONFIG_TRUEHD_DECODER */
diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c
index 76d26bcb9c1e5bc94e5dca74eb6225e555ff861a..64e5da6324b3e53924088a9f0806a335e1ef5009 100644
--- a/libavcodec/mmaldec.c
+++ b/libavcodec/mmaldec.c
@@ -771,7 +771,7 @@ AVCodec ff_h264_mmal_decoder = {
.decode = ffmmal_decode,
.flush = ffmmal_flush,
.priv_class = &ffmmaldec_class,
- .capabilities = CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DELAY,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_MMAL,
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE},
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index 25124a3edf6fa9f3c883c7773da840a2ddaa36ee..f8adcddd3a734c8035138afebd5bfc7e041971f5 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -248,5 +248,5 @@ AVCodec ff_mmvideo_decoder = {
.init = mm_decode_init,
.close = mm_decode_end,
.decode = mm_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c
index c8cf00b69c0a5ede4f8d687cd8c2ff061e7f19d9..e97a0cdeba4c5f5eed884113cf05a8319f74b7e2 100644
--- a/libavcodec/motionpixels.c
+++ b/libavcodec/motionpixels.c
@@ -331,5 +331,5 @@ AVCodec ff_motionpixels_decoder = {
.init = mp_decode_init,
.close = mp_decode_end,
.decode = mp_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index 2185aec88b09f14ba8a317c33b561e42e7aeb0aa..28b51922ecc289f3cd3d60c2256050f84a683315 100644
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -337,7 +337,7 @@ AVCodec ff_mpc7_decoder = {
.close = mpc7_decode_close,
.decode = mpc7_decode_frame,
.flush = mpc7_decode_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index ee05a938b653fe5589dafa7135494ddd30fc054b..84dbb61f7d3959f089fcb3be2e93699f614a5053 100644
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -434,7 +434,7 @@ AVCodec ff_mpc8_decoder = {
.init = mpc8_decode_init,
.decode = mpc8_decode_frame,
.flush = mpc8_decode_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index cefeeff6c6023195fcf39084157c6fd702b84384..be20414c12ab27da9e4cfecd08d652a9ed847fc1 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2701,9 +2701,9 @@ AVCodec ff_mpeg1video_decoder = {
.init = mpeg_decode_init,
.close = mpeg_decode_end,
.decode = mpeg_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 |
- CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY |
- CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 |
+ AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY |
+ AV_CODEC_CAP_SLICE_THREADS,
.flush = flush,
.update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg_decode_update_thread_context)
};
@@ -2717,9 +2717,9 @@ AVCodec ff_mpeg2video_decoder = {
.init = mpeg_decode_init,
.close = mpeg_decode_end,
.decode = mpeg_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 |
- CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY |
- CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 |
+ AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY |
+ AV_CODEC_CAP_SLICE_THREADS,
.flush = flush,
.profiles = NULL_IF_CONFIG_SMALL(mpeg2_video_profiles),
};
@@ -2752,8 +2752,9 @@ AVCodec ff_mpeg_xvmc_decoder = {
.init = mpeg_mc_decode_init,
.close = mpeg_decode_end,
.decode = mpeg_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 |
- CODEC_CAP_TRUNCATED | CODEC_CAP_HWACCEL | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 |
+ AV_CODEC_CAP_TRUNCATED | CODEC_CAP_HWACCEL |
+ AV_CODEC_CAP_DELAY,
.flush = flush,
};
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index 1a48e56a79b8b24e6dac47efed0ed04970020c8e..61716785a18627c0b51b8ed474a28c728a6777ed 100644
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -1089,7 +1089,7 @@ AVCodec ff_mpeg1video_encoder = {
.supported_framerates = ff_mpeg12_frame_rate_tab + 1,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE },
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS,
.priv_class = &mpeg1_class,
};
@@ -1106,6 +1106,6 @@ AVCodec ff_mpeg2video_encoder = {
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
AV_PIX_FMT_YUV422P,
AV_PIX_FMT_NONE },
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS,
.priv_class = &mpeg2_class,
};
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 5345e465ae7ee8c14df8d14c76fdfe426e1339ea..146a332b7224b2b26d0f08f7ca86119341c3a85b 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -2627,9 +2627,9 @@ AVCodec ff_mpeg4_decoder = {
.init = decode_init,
.close = ff_h263_decode_end,
.decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 |
- CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY |
- CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 |
+ AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY |
+ AV_CODEC_CAP_FRAME_THREADS,
.flush = ff_mpeg_flush,
.pix_fmts = ff_h263_hwaccel_pixfmt_list_420,
.profiles = NULL_IF_CONFIG_SMALL(mpeg4_video_profiles),
diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c
index 76fe5a3a65ea6a7363d2397f7c53f482b2ce081b..db7d3ad46ba29d0a30375df4e969e919758b3ef6 100644
--- a/libavcodec/mpeg4videoenc.c
+++ b/libavcodec/mpeg4videoenc.c
@@ -1404,6 +1404,6 @@ AVCodec ff_mpeg4_encoder = {
.encode2 = ff_mpv_encode_picture,
.close = ff_mpv_encode_end,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS,
.priv_class = &mpeg4enc_class,
};
diff --git a/libavcodec/mpegaudiodec_fixed.c b/libavcodec/mpegaudiodec_fixed.c
index 6f21b0c61bb95970e217e816f750fdfeb784e9d2..2db1e184df596599e4709123bcfa3aa60e61e5af 100644
--- a/libavcodec/mpegaudiodec_fixed.c
+++ b/libavcodec/mpegaudiodec_fixed.c
@@ -47,7 +47,7 @@ AVCodec ff_mp1_decoder = {
.priv_data_size = sizeof(MPADecodeContext),
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = flush,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_S16,
@@ -63,7 +63,7 @@ AVCodec ff_mp2_decoder = {
.priv_data_size = sizeof(MPADecodeContext),
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = flush,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_S16,
@@ -79,7 +79,7 @@ AVCodec ff_mp3_decoder = {
.priv_data_size = sizeof(MPADecodeContext),
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = flush,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_S16,
@@ -95,7 +95,7 @@ AVCodec ff_mp3adu_decoder = {
.priv_data_size = sizeof(MPADecodeContext),
.init = decode_init,
.decode = decode_frame_adu,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = flush,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_S16,
@@ -112,7 +112,7 @@ AVCodec ff_mp3on4_decoder = {
.init = decode_init_mp3on4,
.close = decode_close_mp3on4,
.decode = decode_frame_mp3on4,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = flush_mp3on4,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE },
diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c
index 3a76055522ed2eaaf11f123878781da4aa55684d..7bdfd909672b463f8999ebf9033180fa5023556c 100644
--- a/libavcodec/mpegaudiodec_float.c
+++ b/libavcodec/mpegaudiodec_float.c
@@ -47,7 +47,7 @@ AVCodec ff_mp1float_decoder = {
.priv_data_size = sizeof(MPADecodeContext),
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = flush,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_FLT,
@@ -63,7 +63,7 @@ AVCodec ff_mp2float_decoder = {
.priv_data_size = sizeof(MPADecodeContext),
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = flush,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_FLT,
@@ -79,7 +79,7 @@ AVCodec ff_mp3float_decoder = {
.priv_data_size = sizeof(MPADecodeContext),
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = flush,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_FLT,
@@ -95,7 +95,7 @@ AVCodec ff_mp3adufloat_decoder = {
.priv_data_size = sizeof(MPADecodeContext),
.init = decode_init,
.decode = decode_frame_adu,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = flush,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_FLT,
@@ -112,7 +112,7 @@ AVCodec ff_mp3on4float_decoder = {
.init = decode_init_mp3on4,
.close = decode_close_mp3on4,
.decode = decode_frame_mp3on4,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = flush_mp3on4,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index b25ce47332b2cfb66250bcd3b5b7b4f413e263d4..c46bcf4a16ed284b3e8c5bcb7c10ff186709cf14 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -4387,7 +4387,7 @@ AVCodec ff_h263p_encoder = {
.init = ff_mpv_encode_init,
.encode2 = ff_mpv_encode_picture,
.close = ff_mpv_encode_end,
- .capabilities = CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_SLICE_THREADS,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
.priv_class = &h263p_class,
};
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index bc3cd7629ba653c4b8b7a0f8a4de4f8332e8d6ab..67a8609cddaac6cd2df72196ca1fc2610cf7c22d 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -913,7 +913,7 @@ AVCodec ff_msmpeg4v1_decoder = {
.init = ff_msmpeg4_decode_init,
.close = ff_h263_decode_end,
.decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
@@ -929,7 +929,7 @@ AVCodec ff_msmpeg4v2_decoder = {
.init = ff_msmpeg4_decode_init,
.close = ff_h263_decode_end,
.decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
@@ -945,7 +945,7 @@ AVCodec ff_msmpeg4v3_decoder = {
.init = ff_msmpeg4_decode_init,
.close = ff_h263_decode_end,
.decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
@@ -961,7 +961,7 @@ AVCodec ff_wmv1_decoder = {
.init = ff_msmpeg4_decode_init,
.close = ff_h263_decode_end,
.decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index 4b39c920611e99ffd1facdc4ea992b997383c348..a1adeba949d3f150cb7163cb3235465bf8c4fd77 100644
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -157,5 +157,5 @@ AVCodec ff_msrle_decoder = {
.init = msrle_decode_init,
.close = msrle_decode_end,
.decode = msrle_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c
index a67a942ac26aff9889edb43c390b54007ad90758..a31af06e73ee6a419f3b842a6d12f9ef8a8ab4af 100644
--- a/libavcodec/mss1.c
+++ b/libavcodec/mss1.c
@@ -224,5 +224,5 @@ AVCodec ff_mss1_decoder = {
.init = mss1_decode_init,
.close = mss1_decode_end,
.decode = mss1_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c
index d1b72b31c0adfda2c289b9bc2fd93ca3cbbe3387..7a6ce2680eb692cac3d8377c6e1923f09c12aa79 100644
--- a/libavcodec/mss2.c
+++ b/libavcodec/mss2.c
@@ -854,5 +854,5 @@ AVCodec ff_mss2_decoder = {
.init = mss2_decode_init,
.close = mss2_decode_end,
.decode = mss2_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/mss3.c b/libavcodec/mss3.c
index 9a0b1fb3e88181331ff8eb457a5a46f3c97110c5..c124834036b30bbf231401ceb41809960758167f 100644
--- a/libavcodec/mss3.c
+++ b/libavcodec/mss3.c
@@ -870,5 +870,5 @@ AVCodec ff_msa1_decoder = {
.init = mss3_decode_init,
.close = mss3_decode_end,
.decode = mss3_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/mss4.c b/libavcodec/mss4.c
index 9198acc6a7405a6a75f0049f783904979c917305..a953a5759d0c4ebb7dbf786a89deef9c1920041e 100644
--- a/libavcodec/mss4.c
+++ b/libavcodec/mss4.c
@@ -680,5 +680,5 @@ AVCodec ff_mts2_decoder = {
.init = mss4_decode_init,
.close = mss4_decode_end,
.decode = mss4_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c
index 7fd863354ee3c5c954a39cc32666130704682ac4..62f52b153d3732e627f1faa9fa71843629fe3cd1 100644
--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@@ -346,5 +346,5 @@ AVCodec ff_msvideo1_decoder = {
.init = msvideo1_decode_init,
.close = msvideo1_decode_end,
.decode = msvideo1_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/mvcdec.c b/libavcodec/mvcdec.c
index 7cc032925735b1bbe4e9ab3b7c3cabef664f2833..1546bcce187fc2bc784555f54917a695f8856a72 100644
--- a/libavcodec/mvcdec.c
+++ b/libavcodec/mvcdec.c
@@ -274,7 +274,7 @@ AVCodec ff_mvc1_decoder = {
.init = mvc_decode_init,
.close = mvc_decode_end,
.decode = mvc_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
@@ -288,6 +288,6 @@ AVCodec ff_mvc2_decoder = {
.init = mvc_decode_init,
.close = mvc_decode_end,
.decode = mvc_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c
index 46536981e4f32f3bf3ececde2b3c101bb0fbe464..a8ef6d0e0d64b132d9c92ea364996db653786c3f 100644
--- a/libavcodec/mxpegdec.c
+++ b/libavcodec/mxpegdec.c
@@ -345,6 +345,6 @@ AVCodec ff_mxpeg_decoder = {
.init = mxpeg_decode_init,
.close = mxpeg_decode_end,
.decode = mxpeg_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index 2870b6dc6fc637418f22f62697284a2cc39b2a70..5033282061e21b6827c6e071262e63adf20bde6c 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -199,7 +199,7 @@ AVCodec ff_nellymoser_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_tag,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_PARAM_CHANGE,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_PARAM_CHANGE,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c
index 2486e7b01e9b18fc52b630e0ca979de35fc0a73d..9d120816e0dcd8ce654ca3abcbcb19e4338f5cea 100644
--- a/libavcodec/nellymoserenc.c
+++ b/libavcodec/nellymoserenc.c
@@ -415,7 +415,7 @@ AVCodec ff_nellymoser_encoder = {
.init = encode_init,
.encode2 = encode_frame,
.close = encode_end,
- .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index b3acde4f9dcdc6b1f51dc8706728c90d3e366d06..eb73c2ff826a68f502422763cbe2d5d1765633c1 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -332,5 +332,5 @@ AVCodec ff_nuv_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c
index f94f670f0d85bade9d84404a695da65ea8b7b56c..52a2a6798fd2e0ad339bd711bfdf3b53b8974b45 100644
--- a/libavcodec/nvenc_h264.c
+++ b/libavcodec/nvenc_h264.c
@@ -105,6 +105,6 @@ AVCodec ff_h264_nvenc_encoder = {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_YUV444P,
AV_PIX_FMT_NONE },
- .capabilities = CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DELAY,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
};
diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c
index a862428905c38d28e0eb292bfe6b85922890a568..58bde7731e6e6fffa9eb94165a177b4a5f6e4952 100644
--- a/libavcodec/nvenc_hevc.c
+++ b/libavcodec/nvenc_hevc.c
@@ -103,6 +103,6 @@ AVCodec ff_hevc_nvenc_encoder = {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_YUV444P,
AV_PIX_FMT_NONE },
- .capabilities = CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DELAY,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
};
diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c
index 83589ff44222f3d06e8f6dc06ed4ae7752dbe0dd..3f531bc83bc455c93dd86953f73463a37d5f969f 100644
--- a/libavcodec/on2avc.c
+++ b/libavcodec/on2avc.c
@@ -1012,7 +1012,7 @@ AVCodec ff_on2avc_decoder = {
.init = on2avc_decode_init,
.decode = on2avc_decode_frame,
.close = on2avc_decode_close,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c
index 771922e973a475b52dfa5981959b4219a73a5f65..c51e0d651811907d14f92058e7752f5b60c924fb 100644
--- a/libavcodec/opusdec.c
+++ b/libavcodec/opusdec.c
@@ -676,5 +676,5 @@ AVCodec ff_opus_decoder = {
.close = opus_decode_close,
.decode = opus_decode_packet,
.flush = opus_decode_flush,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
};
diff --git a/libavcodec/pafaudio.c b/libavcodec/pafaudio.c
index 52aaabfcd53056dc1bb31762f07a973504043ff6..c83e7f5cfc838ee4f5a9faebb12c1bda1a6a7ae0 100644
--- a/libavcodec/pafaudio.c
+++ b/libavcodec/pafaudio.c
@@ -80,5 +80,5 @@ AVCodec ff_paf_audio_decoder = {
.id = AV_CODEC_ID_PAF_AUDIO,
.init = paf_audio_init,
.decode = paf_audio_decode,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/pafvideo.c b/libavcodec/pafvideo.c
index 650d036945f67b241f98ba994f82494592523584..b77f47e0053ca74b97dc30d8f9460af5172433c8 100644
--- a/libavcodec/pafvideo.c
+++ b/libavcodec/pafvideo.c
@@ -382,5 +382,5 @@ AVCodec ff_paf_video_decoder = {
.init = paf_video_init,
.close = paf_video_close,
.decode = paf_video_decode,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c
index 85703ebfe6b1f5aa193e386a9e3515a69f070d7f..51fcd2d00728f676b175cf18bfe5ddc9384fdbca 100644
--- a/libavcodec/pcm-bluray.c
+++ b/libavcodec/pcm-bluray.c
@@ -308,7 +308,7 @@ AVCodec ff_pcm_bluray_decoder = {
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_PCM_BLURAY,
.decode = pcm_bluray_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]){
AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE
},
diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c
index cb6bb0e5eda011cb5e6b6c32e9e86f6ce09c0c3a..744b720c7397f4ec1011daf5744d69a16b102617 100644
--- a/libavcodec/pcm-dvd.c
+++ b/libavcodec/pcm-dvd.c
@@ -281,7 +281,7 @@ AVCodec ff_pcm_dvd_decoder = {
.init = pcm_dvd_decode_init,
.decode = pcm_dvd_decode_frame,
.close = pcm_dvd_decode_uninit,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) {
AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE
}
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index 8c44639f5bda3226ac02449984089979178b1d54..959c50b27925604b16bb32c208bc69fd93a28610 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -450,7 +450,7 @@ AVCodec ff_ ## name_ ## _encoder = { \
.id = AV_CODEC_ID_ ## id_, \
.init = pcm_encode_init, \
.encode2 = pcm_encode_frame, \
- .capabilities = CODEC_CAP_VARIABLE_FRAME_SIZE, \
+ .capabilities = AV_CODEC_CAP_VARIABLE_FRAME_SIZE, \
.sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_, \
AV_SAMPLE_FMT_NONE }, \
}
@@ -472,7 +472,7 @@ AVCodec ff_ ## name_ ## _decoder = { \
.priv_data_size = sizeof(PCMDecode), \
.init = pcm_decode_init, \
.decode = pcm_decode_frame, \
- .capabilities = CODEC_CAP_DR1, \
+ .capabilities = AV_CODEC_CAP_DR1, \
.sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_, \
AV_SAMPLE_FMT_NONE }, \
}
diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c
index 61c971e073f2e400dba95482c9862f2e344de284..d9f0d24ab16eb11641690396138ffa1423e956db 100644
--- a/libavcodec/pcx.c
+++ b/libavcodec/pcx.c
@@ -244,5 +244,5 @@ AVCodec ff_pcx_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PCX,
.decode = pcx_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
index 33c4545483a7976a30991d1309e3bd55353b75e0..9477bc402d2953b853bc133ac8d7f88e2f7a707a 100644
--- a/libavcodec/pictordec.c
+++ b/libavcodec/pictordec.c
@@ -249,5 +249,5 @@ AVCodec ff_pictor_decoder = {
.id = AV_CODEC_ID_PICTOR,
.priv_data_size = sizeof(PicContext),
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 823d77f0275c4919a22c87794a4e7d7cfe5a752f..4ca919bd8956e21f102ae79e6957fcf2a0530265 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -675,5 +675,5 @@ AVCodec ff_png_decoder = {
.init = png_dec_init,
.close = png_dec_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
+ .capabilities = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/,
};
diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
index 9074d9b28ce3b9a99a391110ccb6ca647eb9241f..d23e2c0d3e61640048115a03820fde1961cd5aa8 100644
--- a/libavcodec/pnmdec.c
+++ b/libavcodec/pnmdec.c
@@ -235,7 +235,7 @@ AVCodec ff_pgm_decoder = {
.id = AV_CODEC_ID_PGM,
.priv_data_size = sizeof(PNMContext),
.decode = pnm_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
@@ -247,7 +247,7 @@ AVCodec ff_pgmyuv_decoder = {
.id = AV_CODEC_ID_PGMYUV,
.priv_data_size = sizeof(PNMContext),
.decode = pnm_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
@@ -259,7 +259,7 @@ AVCodec ff_ppm_decoder = {
.id = AV_CODEC_ID_PPM,
.priv_data_size = sizeof(PNMContext),
.decode = pnm_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
@@ -271,7 +271,7 @@ AVCodec ff_pbm_decoder = {
.id = AV_CODEC_ID_PBM,
.priv_data_size = sizeof(PNMContext),
.decode = pnm_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
@@ -283,6 +283,6 @@ AVCodec ff_pam_decoder = {
.id = AV_CODEC_ID_PAM,
.priv_data_size = sizeof(PNMContext),
.decode = pnm_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c
index b2c2b28fdfc88217c5fe6a4cba876586dd3ff5fb..8a53719d9fae93b729f1c5929708fdf162159c71 100644
--- a/libavcodec/proresdec.c
+++ b/libavcodec/proresdec.c
@@ -778,5 +778,5 @@ AVCodec ff_prores_decoder = {
.init = decode_init,
.close = decode_close,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS,
};
diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c
index 6079eecec549bf3af0195c3138b8e29274ca8997..e38f7a070f5e8baeb6f8b423be5083fb0d480ac6 100644
--- a/libavcodec/proresenc.c
+++ b/libavcodec/proresenc.c
@@ -1332,7 +1332,7 @@ AVCodec ff_prores_encoder = {
.init = encode_init,
.close = encode_close,
.encode2 = encode_frame,
- .capabilities = CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_SLICE_THREADS,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10,
AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_NONE
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 872bbd5b4be2f432d398508654e8deb37ba3e365..3b3f3ad8b48be803ffea136470627a7f49f4e899 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -45,7 +45,7 @@
*/
static void validate_thread_parameters(AVCodecContext *avctx)
{
- int frame_threading_supported = (avctx->codec->capabilities & CODEC_CAP_FRAME_THREADS)
+ int frame_threading_supported = (avctx->codec->capabilities & AV_CODEC_CAP_FRAME_THREADS)
&& !(avctx->flags & AV_CODEC_FLAG_TRUNCATED)
&& !(avctx->flags & AV_CODEC_FLAG_LOW_DELAY)
&& !(avctx->flags2 & AV_CODEC_FLAG2_CHUNKS);
@@ -53,10 +53,10 @@ static void validate_thread_parameters(AVCodecContext *avctx)
avctx->active_thread_type = 0;
} else if (frame_threading_supported && (avctx->thread_type & FF_THREAD_FRAME)) {
avctx->active_thread_type = FF_THREAD_FRAME;
- } else if (avctx->codec->capabilities & CODEC_CAP_SLICE_THREADS &&
+ } else if (avctx->codec->capabilities & AV_CODEC_CAP_SLICE_THREADS &&
avctx->thread_type & FF_THREAD_SLICE) {
avctx->active_thread_type = FF_THREAD_SLICE;
- } else if (!(avctx->codec->capabilities & CODEC_CAP_AUTO_THREADS)) {
+ } else if (!(avctx->codec->capabilities & AV_CODEC_CAP_AUTO_THREADS)) {
avctx->thread_count = 1;
avctx->active_thread_type = 0;
}
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index da339ccee87c891df3c3567ca557e2e5bdd37a32..64b8aa552f6c041003df4f943c92bc7f73f441e6 100644
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -304,7 +304,8 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt)
PerThreadContext *prev_thread = fctx->prev_thread;
const AVCodec *codec = p->avctx->codec;
- if (!avpkt->size && !(codec->capabilities & CODEC_CAP_DELAY)) return 0;
+ if (!avpkt->size && !(codec->capabilities & AV_CODEC_CAP_DELAY))
+ return 0;
pthread_mutex_lock(&p->mutex);
diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c
index 76fff26bb6274420cc23c1eb7ecd9704183ca843..312850c2462498fdc57d50f16a8d362c1d39f741 100644
--- a/libavcodec/ptx.c
+++ b/libavcodec/ptx.c
@@ -96,5 +96,5 @@ AVCodec ff_ptx_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PTX,
.decode = ptx_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c
index d4a82ee9010de51d6ddfaf4f554e789013c4dbf2..2eeefb8b4a40d06434f90359c3b51d9964adf292 100644
--- a/libavcodec/qcelpdec.c
+++ b/libavcodec/qcelpdec.c
@@ -794,6 +794,6 @@ AVCodec ff_qcelp_decoder = {
.id = AV_CODEC_ID_QCELP,
.init = qcelp_decode_init,
.decode = qcelp_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.priv_data_size = sizeof(QCELPContext),
};
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 7ef979b5dd77994ee6e745de0a386d17a0084023..4736facfdfe9d9a9de83b3ac248097b3922ae781 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -2010,5 +2010,5 @@ AVCodec ff_qdm2_decoder = {
.init_static_data = qdm2_init_static_data,
.close = qdm2_decode_close,
.decode = qdm2_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
index 477175c066d949627086c2cac425957210e58f4c..b7493e4da7b8aef9f597b666126b0eb5eb3456b8 100644
--- a/libavcodec/qdrw.c
+++ b/libavcodec/qdrw.c
@@ -308,5 +308,5 @@ AVCodec ff_qdraw_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_QDRAW,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c
index 4de1655ebbce7ad37de29164ef951c4aedd5c0e8..f549cd59fc5d5f0d6eac8470f0be970bf3aa0015 100644
--- a/libavcodec/qpeg.c
+++ b/libavcodec/qpeg.c
@@ -327,5 +327,5 @@ AVCodec ff_qpeg_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/qsvdec_h2645.c b/libavcodec/qsvdec_h2645.c
index 1c01121eb3864cd57123fbc208bb0d6c6912b58d..ec34a18fcc5beb8e97399ae34eb08ebfb8d4c98b 100644
--- a/libavcodec/qsvdec_h2645.c
+++ b/libavcodec/qsvdec_h2645.c
@@ -276,7 +276,7 @@ AVCodec ff_h264_qsv_decoder = {
.decode = qsv_decode_frame,
.flush = qsv_decode_flush,
.close = qsv_decode_close,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
.priv_class = &class,
};
#endif
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
index 441ede8b1456f64798cd4146e9a5a2a31798e690..7399dc76d95c9581600583a085009ecc94e6b0c6 100644
--- a/libavcodec/qsvenc_h264.c
+++ b/libavcodec/qsvenc_h264.c
@@ -112,7 +112,7 @@ AVCodec ff_h264_qsv_encoder = {
.init = qsv_enc_init,
.encode2 = qsv_enc_frame,
.close = qsv_enc_close,
- .capabilities = CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DELAY,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12,
AV_PIX_FMT_QSV,
AV_PIX_FMT_NONE },
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c
index 28f1720aea2db405fbe4f74105e65bf4d868e798..d88144fede1f95887f17d2bf283b0f8e6d9be81c 100644
--- a/libavcodec/qtrle.c
+++ b/libavcodec/qtrle.c
@@ -513,5 +513,5 @@ AVCodec ff_qtrle_decoder = {
.init = qtrle_decode_init,
.close = qtrle_decode_end,
.decode = qtrle_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c
index 6adaac0d35be72fbe6358dd9cfa06592fa454860..f168fd3bfd1208cb8c8a3decd6641902640cdc3d 100644
--- a/libavcodec/r210dec.c
+++ b/libavcodec/r210dec.c
@@ -89,7 +89,7 @@ AVCodec ff_r210_decoder = {
.id = AV_CODEC_ID_R210,
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
#if CONFIG_R10K_DECODER
@@ -100,6 +100,6 @@ AVCodec ff_r10k_decoder = {
.id = AV_CODEC_ID_R10K,
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif
diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c
index 3be3877f313215f880d2e70da29386f22535c6f9..289535741fe2d4cf153eb7eb28c78e200142dcbb 100644
--- a/libavcodec/ra144dec.c
+++ b/libavcodec/ra144dec.c
@@ -135,5 +135,5 @@ AVCodec ff_ra_144_decoder = {
.priv_data_size = sizeof(RA144Context),
.init = ra144_decode_init,
.decode = ra144_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c
index fd04766561c4b8a038928edb972632ce55b7eef2..1d1498bd32b3fd37fe2c84795bccb42069e9eb4a 100644
--- a/libavcodec/ra144enc.c
+++ b/libavcodec/ra144enc.c
@@ -553,7 +553,7 @@ AVCodec ff_ra_144_encoder = {
.init = ra144_encode_init,
.encode2 = ra144_encode_frame,
.close = ra144_encode_close,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SMALL_LAST_FRAME,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
index bcc06e858bd032025590c7d81a187d8f16d4dbfa..a306231129ea418a23028024f1eb1b72e74d6006 100644
--- a/libavcodec/ra288.c
+++ b/libavcodec/ra288.c
@@ -230,5 +230,5 @@ AVCodec ff_ra_288_decoder = {
.priv_data_size = sizeof(RA288Context),
.init = ra288_decode_init,
.decode = ra288_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c
index ebcdf6fbe379e99ee1888acc9f19c7c7d378acd3..bed5adfe0039bfb8dfbc36a007d9655c8dc002f6 100644
--- a/libavcodec/ralf.c
+++ b/libavcodec/ralf.c
@@ -532,7 +532,7 @@ AVCodec ff_ralf_decoder = {
.close = decode_close,
.decode = decode_frame,
.flush = decode_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c
index 54b3e6a0107db140f14c0c0fa5396be4c35dc372..ba539e7d3abb1310c95e2cb74f286a9ca1a5406b 100644
--- a/libavcodec/rl2.c
+++ b/libavcodec/rl2.c
@@ -224,5 +224,5 @@ AVCodec ff_rl2_decoder = {
.init = rl2_decode_init,
.close = rl2_decode_end,
.decode = rl2_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c
index 936b809e39ac556b2140968553480bc1d7112feb..f687f5cd9d9294737a84b2136679eba9d381143f 100644
--- a/libavcodec/roqaudioenc.c
+++ b/libavcodec/roqaudioenc.c
@@ -200,7 +200,7 @@ AVCodec ff_roq_dpcm_encoder = {
.init = roq_dpcm_encode_init,
.encode2 = roq_dpcm_encode_frame,
.close = roq_dpcm_encode_close,
- .capabilities = CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index ac7d4bafe0efbc94acaf90b5f0a1fdc54578141b..0ce694388f52a0b79cc354154247a93c62469594 100644
--- a/libavcodec/roqvideodec.c
+++ b/libavcodec/roqvideodec.c
@@ -234,5 +234,5 @@ AVCodec ff_roq_decoder = {
.init = roq_decode_init,
.close = roq_decode_end,
.decode = roq_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c
index 83dde7a9c3c5aaddd32de18df4b7ccc3622cae61..f365a06fb95a3597c4f426619375d729d9d9eb7a 100644
--- a/libavcodec/rpza.c
+++ b/libavcodec/rpza.c
@@ -278,5 +278,5 @@ AVCodec ff_rpza_decoder = {
.init = rpza_decode_init,
.close = rpza_decode_end,
.decode = rpza_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index cd95b602da401ee72f50324510ffd93806abd057..29a46399e2a7c90bc2705d1e220c03807b3f2557 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -775,7 +775,7 @@ AVCodec ff_rv10_decoder = {
.init = rv10_decode_init,
.close = rv10_decode_end,
.decode = rv10_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
@@ -791,7 +791,7 @@ AVCodec ff_rv20_decoder = {
.init = rv10_decode_init,
.close = rv10_decode_end,
.decode = rv10_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
.flush = ff_mpeg_flush,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index 1675ea22785e1e3dcb165aeb939f68fda6c51c08..bf22df5f109a3d0f5ffb23267b0504f68e70affa 100644
--- a/libavcodec/rv30.c
+++ b/libavcodec/rv30.c
@@ -282,8 +282,8 @@ AVCodec ff_rv30_decoder = {
.init = rv30_decode_init,
.close = ff_rv34_decode_end,
.decode = ff_rv34_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY |
- CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY |
+ AV_CODEC_CAP_FRAME_THREADS,
.flush = ff_mpeg_flush,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c
index 6553667efa1c2616d92136e4a303fbba4bcad310..e6c77e8710f0d9a6328243520218612fd59ef988 100644
--- a/libavcodec/rv40.c
+++ b/libavcodec/rv40.c
@@ -571,8 +571,8 @@ AVCodec ff_rv40_decoder = {
.init = rv40_decode_init,
.close = ff_rv34_decode_end,
.decode = ff_rv34_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY |
- CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY |
+ AV_CODEC_CAP_FRAME_THREADS,
.flush = ff_mpeg_flush,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
diff --git a/libavcodec/s302m.c b/libavcodec/s302m.c
index 36384fb29a8015a6d2e7df2c3f82ef63cd849866..635f697b5c6e38f43911f015f9a7407fc081593d 100644
--- a/libavcodec/s302m.c
+++ b/libavcodec/s302m.c
@@ -146,5 +146,5 @@ AVCodec ff_s302m_decoder = {
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_S302M,
.decode = s302m_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c
index 41c65510e517e541a578a365c9cdfdb3f3d30ce5..6436f84895d75c73f5bd34ff38621d84e8fccdb3 100644
--- a/libavcodec/sanm.c
+++ b/libavcodec/sanm.c
@@ -1473,5 +1473,5 @@ AVCodec ff_sanm_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c
index ebca2e8f0099270e2b61e8f7557053159ba2b854..c827ff555974ef9d03c5f78da36443f4ccdc360c 100644
--- a/libavcodec/sgidec.c
+++ b/libavcodec/sgidec.c
@@ -299,5 +299,5 @@ AVCodec ff_sgi_decoder = {
.priv_data_size = sizeof(SgiState),
.decode = decode_frame,
.init = sgi_decode_init,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/sgirledec.c b/libavcodec/sgirledec.c
index d7bc5a9ea4c2b9ddc4e1512a412f5070f81b3d51..67d79c81e823297b1927cdd8d70c9401d5459b8d 100644
--- a/libavcodec/sgirledec.c
+++ b/libavcodec/sgirledec.c
@@ -156,5 +156,5 @@ AVCodec ff_sgirle_decoder = {
.init = sgirle_decode_init,
.close = sgirle_decode_end,
.decode = sgirle_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index c93ba6b0269a6b325e48d4a8eb9743a902fc2496..d3a82ca6157b3b15a9f71e6d29645a975164f78b 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -658,7 +658,7 @@ AVCodec ff_shorten_decoder = {
.init = shorten_decode_init,
.close = shorten_decode_close,
.decode = shorten_decode_frame,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c
index 81c38a3a99bd81172fd7306dca8dd0d936c51a8d..3f17686a2a9444ef4c487dda23f0918a279f5a37 100644
--- a/libavcodec/sipr.c
+++ b/libavcodec/sipr.c
@@ -572,5 +572,5 @@ AVCodec ff_sipr_decoder = {
.priv_data_size = sizeof(SiprContext),
.init = sipr_decoder_init,
.decode = sipr_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index ba693034e5c5e7c1dc37df13cb1a53a86f16b614..20f93d5c8bd547d77aee1d6b5721f0b72bd66502 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -763,7 +763,7 @@ AVCodec ff_smacker_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
AVCodec ff_smackaud_decoder = {
@@ -773,5 +773,5 @@ AVCodec ff_smackaud_decoder = {
.id = AV_CODEC_ID_SMACKAUDIO,
.init = smka_decode_init,
.decode = smka_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/smc.c b/libavcodec/smc.c
index c6541da8438f0e267d14a363d1ae6672fd710013..b91e410196db5a4264de9dd103b78b6bca1a4b82 100644
--- a/libavcodec/smc.c
+++ b/libavcodec/smc.c
@@ -474,5 +474,5 @@ AVCodec ff_smc_decoder = {
.init = smc_decode_init,
.close = smc_decode_end,
.decode = smc_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c
index ddf728f1152fc0346e35834df1babae354f2fceb..7f57b6357e89c0f22d0f0f0ba512ffe294c31198 100644
--- a/libavcodec/sp5xdec.c
+++ b/libavcodec/sp5xdec.c
@@ -103,7 +103,7 @@ AVCodec ff_sp5x_decoder = {
.init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end,
.decode = sp5x_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
@@ -116,6 +116,6 @@ AVCodec ff_amv_decoder = {
.init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end,
.decode = sp5x_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c
index ffa685c19f21ecff2ca0fdf8df722cb3b06ada88..6a928bb2cf50f167f7c9a0c5b2885c40480e4a35 100644
--- a/libavcodec/sunrast.c
+++ b/libavcodec/sunrast.c
@@ -172,5 +172,5 @@ AVCodec ff_sunrast_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_SUNRAST,
.decode = sunrast_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index 9f7b2c4cb74b6ca19f04b55dc7ea71f5220b320b..4f8439589188dcd4c2669acec0caa102d9be2031 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -839,7 +839,7 @@ AVCodec ff_svq1_decoder = {
.init = svq1_decode_init,
.close = svq1_decode_end,
.decode = svq1_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = svq1_flush,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV410P,
AV_PIX_FMT_NONE },
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 7ad59d56efc6caa986cde82f59e0ebb1b1a8d3c2..80bc46abdb76cf9a88658f690c3d7661fc11f291 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -1358,9 +1358,9 @@ AVCodec ff_svq3_decoder = {
.init = svq3_decode_init,
.close = svq3_decode_end,
.decode = svq3_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND |
- CODEC_CAP_DR1 |
- CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND |
+ AV_CODEC_CAP_DR1 |
+ AV_CODEC_CAP_DELAY,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUVJ420P,
AV_PIX_FMT_NONE},
};
diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c
index 60e80d590a76b44c2ddc3461d081ba74443a4d2d..c84cca448d3074e20bfb8cb64db159c99a8bc993 100644
--- a/libavcodec/takdec.c
+++ b/libavcodec/takdec.c
@@ -927,7 +927,7 @@ AVCodec ff_tak_decoder = {
.init_static_data = tak_init_static_data,
.close = tak_decode_close,
.decode = tak_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_S32P,
diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index f077c03d65ea8f362ece14ff0938cb2c55267cf1..ef8565f451c9d1fd86647f44438b0b115a279e06 100644
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -238,5 +238,5 @@ AVCodec ff_targa_decoder = {
.id = AV_CODEC_ID_TARGA,
.priv_data_size = sizeof(TargaContext),
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/tdsc.c b/libavcodec/tdsc.c
index b46a3c1c630f75b5fed61199c1f6bcf4cebd5a42..9e1ef2de87c48e1a3b32ef17eea1699e6973501f 100644
--- a/libavcodec/tdsc.c
+++ b/libavcodec/tdsc.c
@@ -621,7 +621,7 @@ AVCodec ff_tdsc_decoder = {
.decode = tdsc_decode_frame,
.close = tdsc_close,
.priv_data_size = sizeof(TDSCContext),
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP,
};
diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c
index 33b257954f39143f9c3c630322fbce36c4651464..626324a170a1360b8abf31b4c8ad2836004b250d 100644
--- a/libavcodec/tiertexseqv.c
+++ b/libavcodec/tiertexseqv.c
@@ -267,5 +267,5 @@ AVCodec ff_tiertexseqvideo_decoder = {
.init = seqvideo_decode_init,
.close = seqvideo_decode_end,
.decode = seqvideo_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index b071c3bf3a161eabb9c958ff46ff9b34ee5eac9e..b70abcc385e6221d277d92d69a6d4babfe0258aa 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -737,5 +737,5 @@ AVCodec ff_tiff_decoder = {
.init = tiff_init,
.close = tiff_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c
index f04a5f5fa157531711250d0c5b3ff66c53499e70..a9fcdf3b28dde18f074f13d97a2e7928bb5a8084 100644
--- a/libavcodec/tmv.c
+++ b/libavcodec/tmv.c
@@ -93,5 +93,5 @@ AVCodec ff_tmv_decoder = {
.id = AV_CODEC_ID_TMV,
.init = tmv_decode_init,
.decode = tmv_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c
index 5dffb4efd9693b0a089c32cd9318bdbd39d66668..3eab33aa290ad29bcecf617b69d7115f57373656 100644
--- a/libavcodec/truemotion1.c
+++ b/libavcodec/truemotion1.c
@@ -910,5 +910,5 @@ AVCodec ff_truemotion1_decoder = {
.init = truemotion1_decode_init,
.close = truemotion1_decode_end,
.decode = truemotion1_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index 094096e4e1a08d58b8eb0f8ddd906b91b65dc95b..d280e3220c805cc92077b401d8ed7da7419a6435 100644
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -998,5 +998,5 @@ AVCodec ff_truemotion2_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c
index 9cf9c92efec6cb10e43ec082dd821bffa7fb3c04..b2195baef404717060839f7b9c40fb011acbb75d 100644
--- a/libavcodec/truespeech.c
+++ b/libavcodec/truespeech.c
@@ -364,5 +364,5 @@ AVCodec ff_truespeech_decoder = {
.priv_data_size = sizeof(TSContext),
.init = truespeech_decode_init,
.decode = truespeech_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c
index 86199342a9d5179504106fa148902b3141df2095..98b5f7161b80e5462a9fe7777910e58a27641e6c 100644
--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@@ -180,5 +180,5 @@ AVCodec ff_tscc_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c
index bd1854b8991c93ddabf314d58dd29fd37deaa23d..d83ccd9d11b5c185d636041a3245847cc9fad9f7 100644
--- a/libavcodec/tscc2.c
+++ b/libavcodec/tscc2.c
@@ -384,5 +384,5 @@ AVCodec ff_tscc2_decoder = {
.init = tscc2_decode_init,
.close = tscc2_decode_end,
.decode = tscc2_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 4d2e2a00be28349ca4a888842a750ad62c025513..7399827f2ff550829efcd3541f93a52f392db0d6 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -477,5 +477,5 @@ AVCodec ff_tta_decoder = {
.init = tta_decode_init,
.close = tta_decode_close,
.decode = tta_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/twinvqdec.c b/libavcodec/twinvqdec.c
index 65028a66409e6923e6792e7ee881421c9bafcc47..b34051019259edb58bf815b39780e3fe45f8b3b6 100644
--- a/libavcodec/twinvqdec.c
+++ b/libavcodec/twinvqdec.c
@@ -421,7 +421,7 @@ AVCodec ff_twinvq_decoder = {
.init = twinvq_decode_init,
.close = ff_twinvq_decode_close,
.decode = ff_twinvq_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/txd.c b/libavcodec/txd.c
index 058ab3ee3864cc96f11453ffb78950ceb12a41f3..463223c963f7dcc7dba53568ea1f9de56b5e7e5f 100644
--- a/libavcodec/txd.c
+++ b/libavcodec/txd.c
@@ -153,5 +153,5 @@ AVCodec ff_txd_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_TXD,
.decode = txd_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c
index b955dd7c04a790443e153208b790a9f5323374ec..46aa27d5d0852e5fd80f3bd7d906a65dba0c3c27 100644
--- a/libavcodec/ulti.c
+++ b/libavcodec/ulti.c
@@ -426,5 +426,5 @@ AVCodec ff_ulti_decoder = {
.init = ulti_decode_init,
.close = ulti_decode_end,
.decode = ulti_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 2ac2d4230431aa52dcfec089714987dfe4cf27cf..50311dee68688f05a88fef4a1bf7bbe08a1ffb07 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1146,7 +1146,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
}
avctx->frame_number = 0;
- if (avctx->codec->capabilities & CODEC_CAP_EXPERIMENTAL &&
+ if ((avctx->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) &&
avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
ret = AVERROR_EXPERIMENTAL;
goto free_and_end;
@@ -1164,7 +1164,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
goto free_and_end;
}
}
- if (!HAVE_THREADS && !(codec->capabilities & CODEC_CAP_AUTO_THREADS))
+ if (!HAVE_THREADS && !(codec->capabilities & AV_CODEC_CAP_AUTO_THREADS))
avctx->thread_count = 1;
if (av_codec_is_encoder(avctx->codec)) {
@@ -1403,7 +1403,7 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
*got_packet_ptr = 0;
- if (!(avctx->codec->capabilities & CODEC_CAP_DELAY) && !frame) {
+ if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY) && !frame) {
av_free_packet(avpkt);
av_init_packet(avpkt);
return 0;
@@ -1434,10 +1434,10 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
/* check for valid frame size */
if (frame) {
- if (avctx->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
+ if (avctx->codec->capabilities & AV_CODEC_CAP_SMALL_LAST_FRAME) {
if (frame->nb_samples > avctx->frame_size)
return AVERROR(EINVAL);
- } else if (!(avctx->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) {
+ } else if (!(avctx->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) {
if (frame->nb_samples < avctx->frame_size &&
!avctx->internal->last_audio_frame) {
ret = pad_last_frame(avctx, &padded_frame, frame);
@@ -1458,7 +1458,7 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr);
if (!ret) {
if (*got_packet_ptr) {
- if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) {
+ if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) {
if (avpkt->pts == AV_NOPTS_VALUE)
avpkt->pts = frame->pts;
if (!avpkt->duration)
@@ -1510,7 +1510,7 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
*got_packet_ptr = 0;
- if (!(avctx->codec->capabilities & CODEC_CAP_DELAY) && !frame) {
+ if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY) && !frame) {
av_free_packet(avpkt);
av_init_packet(avpkt);
avpkt->size = 0;
@@ -1526,7 +1526,7 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
if (!ret) {
if (!*got_packet_ptr)
avpkt->size = 0;
- else if (!(avctx->codec->capabilities & CODEC_CAP_DELAY))
+ else if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY))
avpkt->pts = avpkt->dts = frame->pts;
if (!user_packet && avpkt->size) {
@@ -1570,7 +1570,7 @@ static int apply_param_change(AVCodecContext *avctx, AVPacket *avpkt)
if (!data)
return 0;
- if (!(avctx->codec->capabilities & CODEC_CAP_PARAM_CHANGE)) {
+ if (!(avctx->codec->capabilities & AV_CODEC_CAP_PARAM_CHANGE)) {
av_log(avctx, AV_LOG_ERROR, "This decoder does not support parameter "
"changes, but PARAM_CHANGE side data was sent to it.\n");
return AVERROR(EINVAL);
@@ -1683,7 +1683,8 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
av_frame_unref(picture);
- if ((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size || (avctx->active_thread_type & FF_THREAD_FRAME)) {
+ if ((avctx->codec->capabilities & AV_CODEC_CAP_DELAY) || avpkt->size ||
+ (avctx->active_thread_type & FF_THREAD_FRAME)) {
if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME)
ret = ff_thread_decode_frame(avctx, picture, got_picture_ptr,
avpkt);
@@ -1692,7 +1693,7 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
avpkt);
picture->pkt_dts = avpkt->dts;
/* get_buffer is supposed to set frame parameters */
- if (!(avctx->codec->capabilities & CODEC_CAP_DR1)) {
+ if (!(avctx->codec->capabilities & AV_CODEC_CAP_DR1)) {
picture->sample_aspect_ratio = avctx->sample_aspect_ratio;
picture->width = avctx->width;
picture->height = avctx->height;
@@ -1749,7 +1750,7 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
av_frame_unref(frame);
- if ((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size) {
+ if ((avctx->codec->capabilities & AV_CODEC_CAP_DELAY) || avpkt->size) {
ret = avctx->codec->decode(avctx, frame, got_frame_ptr, avpkt);
if (ret >= 0 && *got_frame_ptr) {
avctx->frame_number++;
@@ -1849,7 +1850,7 @@ static AVCodec *find_encdec(enum AVCodecID id, int encoder)
while (p) {
if ((encoder ? av_codec_is_encoder(p) : av_codec_is_decoder(p)) &&
p->id == id) {
- if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) {
+ if (p->capabilities & AV_CODEC_CAP_EXPERIMENTAL && !experimental) {
experimental = p;
} else
return p;
diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c
index bb8c7aac1ef3bc5ae929b23595a4507373573ba9..0ccd53a93779466ecad5d6f331bfb14bd5850e74 100644
--- a/libavcodec/utvideodec.c
+++ b/libavcodec/utvideodec.c
@@ -562,5 +562,5 @@ AVCodec ff_utvideo_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
};
diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c
index 8827397071efac9c1ddc10325193c5581c985513..74301fe48b89a59613d231cf039494ff27f3988f 100644
--- a/libavcodec/v210dec.c
+++ b/libavcodec/v210dec.c
@@ -113,5 +113,5 @@ AVCodec ff_v210_decoder = {
.id = AV_CODEC_ID_V210,
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/v210x.c b/libavcodec/v210x.c
index 2922c05175675c4f9dbe255c335d8becbcf92863..3f220ff6f46ecfe16e539c2a7938508bafb5ae75 100644
--- a/libavcodec/v210x.c
+++ b/libavcodec/v210x.c
@@ -127,5 +127,5 @@ AVCodec ff_v210x_decoder = {
.id = AV_CODEC_ID_V210X,
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c
index 07be5022768db3510578eb35e5dc0bad4f00a0e6..ca68e0b7ec72c63f3ab7742de7697dacffcb3614 100644
--- a/libavcodec/v410dec.c
+++ b/libavcodec/v410dec.c
@@ -96,5 +96,5 @@ AVCodec ff_v410_decoder = {
.id = AV_CODEC_ID_V410,
.init = v410_decode_init,
.decode = v410_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/vb.c b/libavcodec/vb.c
index 56094d8b9d4ed0da454e71c19a289cf61e7ebfe3..43954c16ee476820842778acf3691a28e9d1e332 100644
--- a/libavcodec/vb.c
+++ b/libavcodec/vb.c
@@ -271,5 +271,5 @@ AVCodec ff_vb_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/vble.c b/libavcodec/vble.c
index 00ac8a3491b4d03b400616f14dcee3d97bc459a5..996a984a58ee7a1b6770b02c27c17e8445f4eab8 100644
--- a/libavcodec/vble.c
+++ b/libavcodec/vble.c
@@ -206,5 +206,5 @@ AVCodec ff_vble_decoder = {
.init = vble_decode_init,
.close = vble_decode_close,
.decode = vble_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index c892453f5fcd03d52293f254cb161d351c472873..67e1d7454f3a463fb3c83be0f908ae6a5a226ab3 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -978,7 +978,7 @@ AVCodec ff_vc1_decoder = {
.close = ff_vc1_decode_end,
.decode = vc1_decode_frame,
.flush = ff_mpeg_flush,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
.pix_fmts = vc1_hwaccel_pixfmt_list_420,
.profiles = NULL_IF_CONFIG_SMALL(profiles)
};
@@ -994,7 +994,7 @@ AVCodec ff_wmv3_decoder = {
.close = ff_vc1_decode_end,
.decode = vc1_decode_frame,
.flush = ff_mpeg_flush,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
.pix_fmts = vc1_hwaccel_pixfmt_list_420,
.profiles = NULL_IF_CONFIG_SMALL(profiles)
};
@@ -1010,7 +1010,7 @@ AVCodec ff_wmv3image_decoder = {
.init = vc1_decode_init,
.close = ff_vc1_decode_end,
.decode = vc1_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = vc1_sprite_flush,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
@@ -1029,7 +1029,7 @@ AVCodec ff_vc1image_decoder = {
.init = vc1_decode_init,
.close = ff_vc1_decode_end,
.decode = vc1_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = vc1_sprite_flush,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index 161704f5458682e5200b6bb3d41bcfc5818fa03b..76c47eb2a4e7ac3b498bb53d0e819ae5a0fdd047 100644
--- a/libavcodec/vcr1.c
+++ b/libavcodec/vcr1.c
@@ -138,5 +138,5 @@ AVCodec ff_vcr1_decoder = {
.priv_data_size = sizeof(VCR1Context),
.init = vcr1_decode_init,
.decode = vcr1_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/vima.c b/libavcodec/vima.c
index 14a3bca3b14d9c20f6c009c31ceccd09e9129c51..6f539a86b62c2535fce741190a3c5ec134d6fe35 100644
--- a/libavcodec/vima.c
+++ b/libavcodec/vima.c
@@ -214,5 +214,5 @@ AVCodec ff_adpcm_vima_decoder = {
.id = AV_CODEC_ID_ADPCM_VIMA,
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/vmdaudio.c b/libavcodec/vmdaudio.c
index 66c5865f852155256cff18b3798587bfabcc99e1..9e02ba763330b7b3fc5f3e01955174c4960fa30e 100644
--- a/libavcodec/vmdaudio.c
+++ b/libavcodec/vmdaudio.c
@@ -229,5 +229,5 @@ AVCodec ff_vmdaudio_decoder = {
.priv_data_size = sizeof(VmdAudioContext),
.init = vmdaudio_decode_init,
.decode = vmdaudio_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/vmdvideo.c b/libavcodec/vmdvideo.c
index aaeff4308ce8e60993b0299778e9cfa1cec58ec6..2e91c06374890faf57737b0df8dd4b64c93a9c5a 100644
--- a/libavcodec/vmdvideo.c
+++ b/libavcodec/vmdvideo.c
@@ -463,5 +463,5 @@ AVCodec ff_vmdvideo_decoder = {
.init = vmdvideo_decode_init,
.close = vmdvideo_decode_end,
.decode = vmdvideo_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c
index 23cfe254531c8be4da0ef90e1aa083c836a48b65..3ef21341177a2e6afddd505016c4ca0029f01104 100644
--- a/libavcodec/vmnc.c
+++ b/libavcodec/vmnc.c
@@ -571,5 +571,5 @@ AVCodec ff_vmnc_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index ae32c6cfdac93b7acd61189e20d5ca919a31cdb1..abc01c8617324b3fc5b5655aaf39a440d06698c3 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -1770,7 +1770,7 @@ AVCodec ff_vorbis_decoder = {
.close = vorbis_decode_close,
.decode = vorbis_decode_frame,
.flush = vorbis_decode_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.channel_layouts = ff_vorbis_channel_layouts,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index 5bbd07efebb627cd2ae04455633f9ed2088db267..35bdd57fb1a9cac463aa2c5136c38baac9c3ccf8 100644
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@ -1205,7 +1205,7 @@ AVCodec ff_vorbis_encoder = {
.init = vorbis_encode_init,
.encode2 = vorbis_encode_frame,
.close = vorbis_encode_close,
- .capabilities = CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_EXPERIMENTAL,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index c5e0663c69e39d578249bfa42fa0ee2ff800ad9b..c2fc3c90d9e469196e2891c6686a5e4405b4d45c 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2495,8 +2495,8 @@ AVCodec ff_theora_decoder = {
.init = theora_decode_init,
.close = vp3_decode_end,
.decode = vp3_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND |
- CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DRAW_HORIZ_BAND |
+ AV_CODEC_CAP_FRAME_THREADS,
.flush = vp3_decode_flush,
.init_thread_copy = ONLY_IF_THREADS_ENABLED(vp3_init_thread_copy),
.update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context)
@@ -2512,8 +2512,8 @@ AVCodec ff_vp3_decoder = {
.init = vp3_decode_init,
.close = vp3_decode_end,
.decode = vp3_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND |
- CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DRAW_HORIZ_BAND |
+ AV_CODEC_CAP_FRAME_THREADS,
.flush = vp3_decode_flush,
.init_thread_copy = ONLY_IF_THREADS_ENABLED(vp3_init_thread_copy),
.update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context),
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index b60928241d99a4233ee9f8b1e94aeb5e7b781437..81c725d96ef236a5121d0a2c95c875b1d56a45f0 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -291,5 +291,5 @@ AVCodec ff_vp5_decoder = {
.init = vp5_decode_init,
.close = ff_vp56_free,
.decode = ff_vp56_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index d10a64001aed0f2955215937dc6d8c47333e7193..4435444afd0e8c3c7ab9379cc03160c75191e708 100644
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -649,7 +649,7 @@ AVCodec ff_vp6_decoder = {
.init = vp6_decode_init,
.close = vp6_decode_free,
.decode = ff_vp56_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
/* flash version, not flipped upside-down */
@@ -662,7 +662,7 @@ AVCodec ff_vp6f_decoder = {
.init = vp6_decode_init,
.close = vp6_decode_free,
.decode = ff_vp56_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
/* flash version, not flipped upside-down, with alpha channel */
@@ -675,5 +675,5 @@ AVCodec ff_vp6a_decoder = {
.init = vp6_decode_init,
.close = vp6_decode_free,
.decode = ff_vp56_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 4ea6d562b3ec6e990cbca917b60797c103a94434..f11076a6edf7e520f30edb35a3a0ef6a9c93617e 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -2756,7 +2756,7 @@ AVCodec ff_vp7_decoder = {
.init = vp7_decode_init,
.close = ff_vp8_decode_free,
.decode = vp7_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.flush = vp8_decode_flush,
};
#endif /* CONFIG_VP7_DECODER */
@@ -2771,7 +2771,8 @@ AVCodec ff_vp8_decoder = {
.init = ff_vp8_decode_init,
.close = ff_vp8_decode_free,
.decode = ff_vp8_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS |
+ AV_CODEC_CAP_SLICE_THREADS,
.flush = vp8_decode_flush,
.init_thread_copy = ONLY_IF_THREADS_ENABLED(vp8_decode_init_thread_copy),
.update_thread_context = ONLY_IF_THREADS_ENABLED(vp8_decode_update_thread_context),
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index b9397f58c5449cd55f05aa61e6a64c6def9e2357..45f0771695897e7a92deeb2628c3dd8a268f96ac 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -1309,5 +1309,5 @@ AVCodec ff_vp9_decoder = {
.decode = vp9_decode_packet,
.flush = vp9_decode_flush,
.close = vp9_decode_free,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index 553929d195ffe8f528d7e9d8a0c9b02e19ee154a..e58bb26f8902f372d0e6193a7237c05b8f384f3a 100644
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -646,5 +646,5 @@ AVCodec ff_vqa_decoder = {
.init = vqa_decode_init,
.close = vqa_decode_end,
.decode = vqa_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index cbc5b04d1ae3c3d1d47c601f350890c41abb0cd9..c8efec2d9ca689cecec0a834692468f73d21fd4f 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -1234,5 +1234,5 @@ AVCodec ff_wavpack_decoder = {
.close = wavpack_decode_end,
.decode = wavpack_decode_frame,
.flush = wavpack_decode_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/webp.c b/libavcodec/webp.c
index 4138e5414f8461a01f8355a9448d84cd355c9c14..c4757446d34eb2019d61f2b447f69151f87dd6be 100644
--- a/libavcodec/webp.c
+++ b/libavcodec/webp.c
@@ -1480,5 +1480,5 @@ AVCodec ff_webp_decoder = {
.priv_data_size = sizeof(WebPContext),
.decode = webp_decode_frame,
.close = webp_decode_close,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
};
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index 8a907673de5ae162ee3aab6043ed7197f6b2ca47..eb7dfd1a5005c63d93749fb2eb887e4119e27b9b 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -936,7 +936,7 @@ AVCodec ff_wmav1_decoder = {
.close = ff_wma_end,
.decode = wma_decode_superframe,
.flush = flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
};
@@ -951,7 +951,7 @@ AVCodec ff_wmav2_decoder = {
.close = ff_wma_end,
.decode = wma_decode_superframe,
.flush = flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
};
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 2a2490431d784214b6e79ca4b81805caf817d7de..6a53b390e720c1b99776857f6ddf8f27a618fa65 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -1311,7 +1311,7 @@ AVCodec ff_wmalossless_decoder = {
.close = decode_close,
.decode = decode_packet,
.flush = flush,
- .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1 | CODEC_CAP_DELAY,
+ .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_S32P,
AV_SAMPLE_FMT_NONE },
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index 1ee5cd1717a56a49a6ad918ba4b7a0eb30c943b9..e69d9734916e7f1aef10b111da156bbb523e2ec2 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -1651,7 +1651,7 @@ AVCodec ff_wmapro_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_packet,
- .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1,
.flush = flush,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index e408166c48001539d030672291e4bcb500c39425..8e9f03878868388e3d86d2088ba2635fe0e5cf39 100644
--- a/libavcodec/wmavoice.c
+++ b/libavcodec/wmavoice.c
@@ -2074,6 +2074,6 @@ AVCodec ff_wmavoice_decoder = {
.init_static_data = wmavoice_init_static_data,
.close = wmavoice_decode_end,
.decode = wmavoice_decode_packet,
- .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1,
.flush = wmavoice_flush,
};
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index 6455f2f2ab2e08eeef8f95e9e9914c9c354619f2..c71fd3dfeae0742d165ae6c38a43d87ee38abaa7 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -489,7 +489,7 @@ AVCodec ff_wmv2_decoder = {
.init = wmv2_decode_init,
.close = wmv2_decode_end,
.decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE },
};
diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c
index 7676c89080d15c9ac5b5afdd301899d882600c86..05dc9a534c8ea29c3a6198d84311ab1f2a0ed1b3 100644
--- a/libavcodec/wnv1.c
+++ b/libavcodec/wnv1.c
@@ -157,5 +157,5 @@ AVCodec ff_wnv1_decoder = {
.priv_data_size = sizeof(WNV1Context),
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c
index fe6f8120e63209cfe420f8c48e1004884cfad8c2..11b7289185f40f03983fd80d86a4a08195b1d03a 100644
--- a/libavcodec/ws-snd1.c
+++ b/libavcodec/ws-snd1.c
@@ -179,5 +179,5 @@ AVCodec ff_ws_snd1_decoder = {
.id = AV_CODEC_ID_WESTWOOD_SND1,
.init = ws_snd_decode_init,
.decode = ws_snd_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index 4bf1d87f9db9dce199d491e06d42d17f3174cf47..e7bbe413b63a17bd49c2bb2350bd0b89a457b6b9 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -620,5 +620,5 @@ AVCodec ff_xan_wc3_decoder = {
.init = xan_decode_init,
.close = xan_decode_end,
.decode = xan_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c
index c26f3433fda84e5ca06209e4dbbed1b3d74803a5..2ce146517085df12659956a795c2ba27778e40b5 100644
--- a/libavcodec/xbmdec.c
+++ b/libavcodec/xbmdec.c
@@ -118,5 +118,5 @@ AVCodec ff_xbm_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_XBM,
.decode = xbm_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/xl.c b/libavcodec/xl.c
index 8e9bdc66f60b6c13acd84b274542b85bd1904c4d..7286c14fdc0633d29d49dc847e705f03f2e67ef8 100644
--- a/libavcodec/xl.c
+++ b/libavcodec/xl.c
@@ -137,5 +137,5 @@ AVCodec ff_xl_decoder = {
.id = AV_CODEC_ID_VIXL,
.init = decode_init,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/xwddec.c b/libavcodec/xwddec.c
index f6ccb96988f0a8fe8be29c764e1d4d4220e849c0..f6d3d97de54e341c92f52d0ba5b9755ea015dee2 100644
--- a/libavcodec/xwddec.c
+++ b/libavcodec/xwddec.c
@@ -248,5 +248,5 @@ AVCodec ff_xwd_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_XWD,
.decode = xwd_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c
index d77a50fd3f0a123dfc8409a6f9179b624a4fc4a8..6369b7de8a8f7637000ee6e1b13d7da00f820a47 100644
--- a/libavcodec/xxan.c
+++ b/libavcodec/xxan.c
@@ -440,5 +440,5 @@ AVCodec ff_xan_wc4_decoder = {
.init = xan_decode_init,
.close = xan_decode_end,
.decode = xan_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/yop.c b/libavcodec/yop.c
index 3434fd9808b323d0728d48f325bcea140bcf2fe1..98ed7237a373d3eb334f085a91b8f4e807a3d769 100644
--- a/libavcodec/yop.c
+++ b/libavcodec/yop.c
@@ -251,5 +251,5 @@ AVCodec ff_yop_decoder = {
.priv_data_size = sizeof(YopDecContext),
.init = yop_decode_init,
.decode = yop_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c
index 89c869cc5f2ef3a12f067c7ce104333d145fed1c..1419e84a3415af20aee54adca4b6d735c636b98b 100644
--- a/libavcodec/zerocodec.c
+++ b/libavcodec/zerocodec.c
@@ -150,5 +150,5 @@ AVCodec ff_zerocodec_decoder = {
.init = zerocodec_decode_init,
.decode = zerocodec_decode_frame,
.close = zerocodec_decode_close,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index f49cbdb014f72c438260069a8a851a9e80afe6f8..0dbf8a17c5e01b0879b16c23f31ef5e196d90801 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -662,5 +662,5 @@ AVCodec ff_zmbv_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 18cd0d72d7c775c48888b15c6ff876e8b136fc7b..fd393082e4de46994d50c23ecc3f4652120d1a30 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1885,7 +1885,7 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt,
ret >= 0 &&
(!has_codec_parameters(st) || !has_decode_delay_been_guessed(st) ||
(!st->codec_info_nb_frames &&
- st->codec->codec->capabilities & CODEC_CAP_CHANNEL_CONF))) {
+ (st->codec->codec->capabilities & AV_CODEC_CAP_CHANNEL_CONF)))) {
got_picture = 0;
switch (st->codec->codec_type) {
case AVMEDIA_TYPE_VIDEO:
@@ -2254,7 +2254,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
* it takes longer and uses more memory. For MPEG-4, we need to
* decompress for QuickTime.
*
- * If CODEC_CAP_CHANNEL_CONF is set this will force decoding of at
+ * If AV_CODEC_CAP_CHANNEL_CONF is set this will force decoding of at
* least one frame of codec data, this makes sure the codec initializes
* the channel configuration and does not only trust the values from
* the container. */