diff options
334 files changed, 613 insertions, 502 deletions
@@ -1324,12 +1324,12 @@ static void print_codec(const AVCodec *c) if (c->type == AVMEDIA_TYPE_VIDEO || c->type == AVMEDIA_TYPE_AUDIO) { 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"); @@ -1503,11 +1503,11 @@ 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 & CODEC_CAP_DRAW_HORIZ_BAND)?"B" : "."); - printf((codec->capabilities & CODEC_CAP_DR1) ? "D" : "."); + 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((codec->capabilities & AV_CODEC_CAP_DRAW_HORIZ_BAND)?"B" : "."); + printf((codec->capabilities & AV_CODEC_CAP_DR1) ? "D" : "."); printf(" %-20s %s", codec->name, codec->long_name ? codec->long_name : ""); if (strcmp(codec->name, desc->name)) diff --git a/doc/examples/decoding_encoding.c b/doc/examples/decoding_encoding.c index 5f26177..e1f4ae3 100644 --- a/doc/examples/decoding_encoding.c +++ b/doc/examples/decoding_encoding.c @@ -561,7 +561,7 @@ static void video_decode_example(const char *outfilename, const char *filename) exit(1); } - 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/muxing.c b/doc/examples/muxing.c index 7aece76..b5bd54a 100644 --- a/doc/examples/muxing.c +++ b/doc/examples/muxing.c @@ -230,7 +230,7 @@ static void open_audio(AVFormatContext *oc, AVCodec *codec, OutputStream *ost, A /* 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/doc/examples/transcoding.c b/doc/examples/transcoding.c index d7a9579..59b113e 100644 --- a/doc/examples/transcoding.c +++ b/doc/examples/transcoding.c @@ -449,7 +449,7 @@ static int flush_encoder(unsigned int stream_index) int got_frame; if (!(ofmt_ctx->streams[stream_index]->codec->codec->capabilities & - CODEC_CAP_DELAY)) + AV_CODEC_CAP_DELAY)) return 0; while (1) { diff --git a/doc/multithreading.txt b/doc/multithreading.txt index 2b992fc..83849de 100644 --- a/doc/multithreading.txt +++ b/doc/multithreading.txt @@ -54,7 +54,7 @@ thread. If the codec allocates writable tables in its init(), add an init_thread_copy() which re-allocates them for other threads. -Add CODEC_CAP_FRAME_THREADS to the codec capabilities. There will be very little +Add AV_CODEC_CAP_FRAME_THREADS to the codec capabilities. There will be very little speed gain at this point but it should work. If there are inter-frame dependencies, so the codec calls @@ -1198,7 +1198,7 @@ static void do_video_out(AVFormatContext *s, av_ts2str(pkt.dts), av_ts2timestr(pkt.dts, &enc->time_base)); } - if (pkt.pts == AV_NOPTS_VALUE && !(enc->codec->capabilities & CODEC_CAP_DELAY)) + if (pkt.pts == AV_NOPTS_VALUE && !(enc->codec->capabilities & AV_CODEC_CAP_DELAY)) pkt.pts = ost->sync_opts; av_packet_rescale_ts(&pkt, enc->time_base, ost->st->time_base); @@ -1377,7 +1377,7 @@ static int reap_filters(int flush) do_video_out(of->ctx, ost, filtered_frame, float_pts); break; case AVMEDIA_TYPE_AUDIO: - if (!(enc->codec->capabilities & CODEC_CAP_PARAM_CHANGE) && + if (!(enc->codec->capabilities & AV_CODEC_CAP_PARAM_CHANGE) && enc->channels != av_frame_get_channels(filtered_frame)) { av_log(NULL, AV_LOG_ERROR, "Audio filter graph output is not normalized and encoder does not support parameter changes\n"); @@ -2297,7 +2297,7 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt) ist->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; @@ -2592,7 +2592,7 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len) return ret; } if (ost->enc->type == AVMEDIA_TYPE_AUDIO && - !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) + !(ost->enc->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) av_buffersink_set_frame_size(ost->filter->filter, ost->enc_ctx->frame_size); assert_avoptions(ost->encoder_opts); diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index f374876..ce2ffc0 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -85,7 +85,7 @@ void choose_sample_fmt(AVStream *st, AVCodec *codec) break; } if (*p == -1) { - if((codec->capabilities & CODEC_CAP_LOSSLESS) && av_get_sample_fmt_name(st->codec->sample_fmt) > av_get_sample_fmt_name(codec->sample_fmts[0])) + if((codec->capabilities & AV_CODEC_CAP_LOSSLESS) && av_get_sample_fmt_name(st->codec->sample_fmt) > av_get_sample_fmt_name(codec->sample_fmts[0])) av_log(NULL, AV_LOG_ERROR, "Conversion will not be lossless.\n"); if(av_get_sample_fmt_name(st->codec->sample_fmt)) av_log(NULL, AV_LOG_WARNING, @@ -1036,7 +1036,7 @@ int configure_filtergraph(FilterGraph *fg) OutputStream *ost = fg->outputs[i]->ost; if (ost && ost->enc->type == AVMEDIA_TYPE_AUDIO && - !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) + !(ost->enc->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) av_buffersink_set_frame_size(ost->filter->filter, ost->enc_ctx->frame_size); } @@ -2698,7 +2698,7 @@ static int stream_component_open(VideoState *is, int stream_index) if(stream_lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE; if (fast) avctx->flags2 |= AV_CODEC_FLAG2_FAST; - if(codec->capabilities & CODEC_CAP_DR1) + if(codec->capabilities & AV_CODEC_CAP_DR1) avctx->flags |= CODEC_FLAG_EMU_EDGE; opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index], codec); diff --git a/libavcodec/012v.c b/libavcodec/012v.c index b87551e..b5a4066 100644 --- a/libavcodec/012v.c +++ b/libavcodec/012v.c @@ -151,5 +151,5 @@ AVCodec ff_zero12v_decoder = { .id = AV_CODEC_ID_012V, .init = zero12v_decode_init, .decode = zero12v_decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 839dbc3..9af4546 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -1026,5 +1026,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 e00bdfc..2e4464d 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -184,5 +184,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 26496e5..edc945c 100644 --- a/libavcodec/8svx.c +++ b/libavcodec/8svx.c @@ -194,7 +194,7 @@ AVCodec ff_eightsvx_fib_decoder = { .init = eightsvx_decode_init, .decode = eightsvx_decode_frame, .close = eightsvx_decode_close, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_NONE }, }; @@ -209,7 +209,7 @@ AVCodec ff_eightsvx_exp_decoder = { .init = eightsvx_decode_init, .decode = eightsvx_decode_frame, .close = eightsvx_decode_close, - .capabilities = CODEC_CAP_DR1, + .capabilities = 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 ceb7dca..1587ac2 100644 --- a/libavcodec/a64multienc.c +++ b/libavcodec/a64multienc.c @@ -406,7 +406,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, }; #endif #if CONFIG_A64MULTI5_ENCODER @@ -420,6 +420,6 @@ 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, }; #endif diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index d4fdf32..2f1bb2a 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -550,7 +550,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, .flush = flush, .priv_class = &aac_decoder_class, @@ -574,7 +574,7 @@ 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, .flush = flush, .profiles = profiles, diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c index 1780811..2a3dbf6 100644 --- a/libavcodec/aacdec_fixed.c +++ b/libavcodec/aacdec_fixed.c @@ -437,7 +437,7 @@ AVCodec ff_aac_fixed_decoder = { .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S32P, 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, .flush = flush, }; diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 043e6fd..bace7cf 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -943,8 +943,8 @@ AVCodec ff_aac_encoder = { .encode2 = aac_encode_frame, .close = aac_encode_end, .supported_samplerates = mpeg4audio_sample_rates, - .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 469fc5e..a91721e 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -158,5 +158,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_fixed.c b/libavcodec/ac3dec_fixed.c index b4beee6..21756ea 100644 --- a/libavcodec/ac3dec_fixed.c +++ b/libavcodec/ac3dec_fixed.c @@ -188,7 +188,7 @@ AVCodec ff_ac3_fixed_decoder = { .init = ac3_decode_init, .close = ac3_decode_end, .decode = ac3_decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/ac3dec_float.c b/libavcodec/ac3dec_float.c index d74a0df..6b46de2 100644 --- a/libavcodec/ac3dec_float.c +++ b/libavcodec/ac3dec_float.c @@ -60,7 +60,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, .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, @@ -83,7 +83,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, .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 2dac23b..bcd7392 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1591,7 +1591,7 @@ AVCodec ff_ ## name_ ## _decoder = { \ .init = adpcm_decode_init, \ .decode = adpcm_decode_frame, \ .flush = adpcm_flush, \ - .capabilities = CODEC_CAP_DR1, \ + .capabilities = AV_CODEC_CAP_DR1, \ .sample_fmts = sample_fmts_, \ } diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index 5115ced..32cc0f0 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -183,7 +183,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 3ca4ffd..5decc78 100644 --- a/libavcodec/aic.c +++ b/libavcodec/aic.c @@ -488,5 +488,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 a5948bb..13607b3 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -674,6 +674,6 @@ AVCodec ff_alac_decoder = { .close = alac_decode_close, .decode = alac_decode_frame, .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .priv_class = &alac_class }; diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c index 4393240..81ca913 100644 --- a/libavcodec/alacenc.c +++ b/libavcodec/alacenc.c @@ -653,7 +653,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 bdc4c72..087b18f 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 b7d147d..ebd364e 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -1853,5 +1853,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 3fa639d..2299a25 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -1088,7 +1088,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 8771a2a..b73b700 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -1273,7 +1273,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 3727534..29d59fb 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 2023359..21d5ae1 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -478,5 +478,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 03afd75..5536e0f 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1570,7 +1570,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 7f87fe7..036d56e 100644 --- a/libavcodec/asvdec.c +++ b/libavcodec/asvdec.c @@ -322,7 +322,7 @@ AVCodec ff_asv1_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; #endif @@ -336,6 +336,6 @@ AVCodec ff_asv2_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; #endif diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c index 3dd781c..b70cf4f 100644 --- a/libavcodec/atrac1.c +++ b/libavcodec/atrac1.c @@ -386,7 +386,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 9f9fa7c..89c877a 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -934,7 +934,7 @@ AVCodec ff_atrac3_decoder = { .init = atrac3_decode_init, .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 90e8e5c..ec2b1ad 100644 --- a/libavcodec/atrac3plusdec.c +++ b/libavcodec/atrac3plusdec.c @@ -392,7 +392,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, .close = atrac3p_decode_close, diff --git a/libavcodec/aura.c b/libavcodec/aura.c index 8d0f16a..5f84d95 100644 --- a/libavcodec/aura.c +++ b/libavcodec/aura.c @@ -104,5 +104,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 41ceec1..be34060 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -826,6 +826,112 @@ typedef struct RcOverride{ */ #define AV_CODEC_FLAG2_SKIP_MANUAL 0x20000000 +/* 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) + +#if FF_API_CAP_VDPAU +/** + * Codec can export data for HW decoding (VDPAU). + */ +#define AV_CODEC_CAP_HWACCEL_VDPAU (1 << 7) +#endif + +/** + * 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) +/** + * Codec is intra only. + */ +#define AV_CODEC_CAP_INTRA_ONLY 0x40000000 +/** + * Codec is lossless. + */ +#define AV_CODEC_CAP_LOSSLESS 0x80000000 + + /** * Allow decoders to produce frames with data planes that are not aligned * to CPU requirements (e.g. due to cropping). @@ -2156,7 +2262,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 */ @@ -2358,7 +2464,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. * @@ -3369,7 +3475,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} @@ -4154,7 +4260,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); @@ -4178,7 +4284,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); @@ -4187,7 +4293,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]); @@ -4285,13 +4391,13 @@ attribute_deprecated int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *s * 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 @@ -4316,7 +4422,7 @@ attribute_deprecated int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *s * @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 @@ -4340,7 +4446,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. * @@ -4380,7 +4486,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. @@ -4742,8 +4848,8 @@ int attribute_deprecated avcodec_encode_audio(AVCodecContext *avctx, * 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. @@ -4804,7 +4910,7 @@ int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size, * 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/avrndec.c b/libavcodec/avrndec.c index 7c156cc..5e40d66 100644 --- a/libavcodec/avrndec.c +++ b/libavcodec/avrndec.c @@ -168,6 +168,6 @@ AVCodec ff_avrn_decoder = { .init = init, .close = end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .max_lowres = 3, }; diff --git a/libavcodec/avs.c b/libavcodec/avs.c index 8205689..345d628 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/avuidec.c b/libavcodec/avuidec.c index 7fb644c..5117844 100644 --- a/libavcodec/avuidec.c +++ b/libavcodec/avuidec.c @@ -126,5 +126,5 @@ AVCodec ff_avui_decoder = { .id = AV_CODEC_ID_AVUI, .init = avui_decode_init, .decode = avui_decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/avuienc.c b/libavcodec/avuienc.c index acfe7bc..9643445 100644 --- a/libavcodec/avuienc.c +++ b/libavcodec/avuienc.c @@ -101,6 +101,6 @@ AVCodec ff_avui_encoder = { .id = AV_CODEC_ID_AVUI, .init = avui_encode_init, .encode2 = avui_encode_frame, - .capabilities = CODEC_CAP_EXPERIMENTAL, + .capabilities = AV_CODEC_CAP_EXPERIMENTAL, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_UYVY422, AV_PIX_FMT_NONE }, }; diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index 37cd22e..97b745d 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -162,5 +162,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 77bca49..6727629 100644 --- a/libavcodec/bfi.c +++ b/libavcodec/bfi.c @@ -184,5 +184,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 c793fa7..131eaa1 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1354,5 +1354,5 @@ AVCodec ff_bink_decoder = { .close = decode_end, .decode = decode_frame, .flush = flush, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index f30ea12..82562b6 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/bintext.c b/libavcodec/bintext.c index 97fceb1..90bbe67 100644 --- a/libavcodec/bintext.c +++ b/libavcodec/bintext.c @@ -227,7 +227,7 @@ AVCodec ff_bintext_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; #endif #if CONFIG_XBIN_DECODER @@ -240,7 +240,7 @@ AVCodec ff_xbin_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; #endif #if CONFIG_IDF_DECODER @@ -253,6 +253,6 @@ AVCodec ff_idf_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; #endif diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index a35ed1a..42270da 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -349,5 +349,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 0e473df..b1587ab 100644 --- a/libavcodec/bmvaudio.c +++ b/libavcodec/bmvaudio.c @@ -85,5 +85,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 76a3d6f..97f850d 100644 --- a/libavcodec/bmvvideo.c +++ b/libavcodec/bmvvideo.c @@ -294,5 +294,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 02d922f..0556858 100644 --- a/libavcodec/brenderpix.c +++ b/libavcodec/brenderpix.c @@ -288,5 +288,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 eff8887..887a585 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -268,5 +268,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 bf8c301..8f5d58d 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1262,6 +1262,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 340df44..aca7cb0 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -376,5 +376,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 adccd52..cd573c5 100644 --- a/libavcodec/cdxl.c +++ b/libavcodec/cdxl.c @@ -305,5 +305,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 1a6d4f5..f1a4656 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -484,5 +484,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 68c8771..4b187f8 100644 --- a/libavcodec/cljrdec.c +++ b/libavcodec/cljrdec.c @@ -89,6 +89,6 @@ 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 c9ab8b9..1c6902a 100644 --- a/libavcodec/cllc.c +++ b/libavcodec/cllc.c @@ -495,5 +495,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 c49e903..c0295cd 100644 --- a/libavcodec/cngdec.c +++ b/libavcodec/cngdec.c @@ -167,5 +167,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 75b184a..4f4f4fc 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -1282,7 +1282,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/cpia.c b/libavcodec/cpia.c index 9036cb3..6b784b2 100644 --- a/libavcodec/cpia.c +++ b/libavcodec/cpia.c @@ -229,5 +229,5 @@ AVCodec ff_cpia_decoder = { .init = cpia_decode_init, .close = cpia_decode_end, .decode = cpia_decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index 001afa4..a299a94 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -1098,7 +1098,7 @@ AVCodec ff_h264_crystalhd_decoder = { .init = init, .close = uninit, .decode = decode, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .flush = flush, .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, .priv_class = &h264_class, @@ -1122,7 +1122,7 @@ AVCodec ff_mpeg2_crystalhd_decoder = { .init = init, .close = uninit, .decode = decode, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .flush = flush, .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, .priv_class = &mpeg2_class, @@ -1146,7 +1146,7 @@ AVCodec ff_mpeg4_crystalhd_decoder = { .init = init, .close = uninit, .decode = decode, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .flush = flush, .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, .priv_class = &mpeg4_class, @@ -1170,7 +1170,7 @@ AVCodec ff_msmpeg4_crystalhd_decoder = { .init = init, .close = uninit, .decode = decode, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_EXPERIMENTAL, .flush = flush, .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, .priv_class = &msmpeg4_class, @@ -1194,7 +1194,7 @@ AVCodec ff_vc1_crystalhd_decoder = { .init = init, .close = uninit, .decode = decode, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .flush = flush, .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, .priv_class = &vc1_class, @@ -1218,7 +1218,7 @@ AVCodec ff_wmv3_crystalhd_decoder = { .init = init, .close = uninit, .decode = decode, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .flush = flush, .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, .priv_class = &wmv3_class, diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index 07f2f5e..278093f 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -166,5 +166,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 6e8e461..c7ec008 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -184,7 +184,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 @@ -197,6 +197,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 8dca7c5..eae6c44 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -2068,7 +2068,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/dcaenc.c b/libavcodec/dcaenc.c index 92b8b1f..be26785 100644 --- a/libavcodec/dcaenc.c +++ b/libavcodec/dcaenc.c @@ -960,7 +960,7 @@ AVCodec ff_dca_encoder = { .priv_data_size = sizeof(DCAEncContext), .init = encode_init, .encode2 = encode_frame, - .capabilities = CODEC_CAP_EXPERIMENTAL, + .capabilities = AV_CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE }, .supported_samplerates = sample_rates, diff --git a/libavcodec/dds.c b/libavcodec/dds.c index 3d1b647..a604d56 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 f13291e..f45d019 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -418,5 +418,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/diracdec.c b/libavcodec/diracdec.c index 49a4952..776aace 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -2040,6 +2040,6 @@ AVCodec ff_dirac_decoder = { .init = dirac_decode_init, .close = dirac_decode_end, .decode = dirac_decode_frame, - .capabilities = CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DELAY, .flush = dirac_decode_flush, }; diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index d38a657..1034d89 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -515,5 +515,5 @@ AVCodec ff_dnxhd_decoder = { .init = dnxhd_decode_init, .close = dnxhd_decode_close, .decode = dnxhd_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, }; diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 9985deb..f254b46 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -1165,7 +1165,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 ecc7a29..c13945e 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -334,7 +334,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 66d8428..15c939f 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -392,5 +392,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 b336d2c..290dab4 100644 --- a/libavcodec/dsicinaudio.c +++ b/libavcodec/dsicinaudio.c @@ -129,5 +129,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 48fb635..f95cbc7 100644 --- a/libavcodec/dsicinvideo.c +++ b/libavcodec/dsicinvideo.c @@ -313,5 +313,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 909ad1f..a402eed 100644 --- a/libavcodec/dss_sp.c +++ b/libavcodec/dss_sp.c @@ -783,5 +783,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 4d080b2..0cece1f 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -568,6 +568,6 @@ 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, .max_lowres = 3, }; diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 5bd0114..5de12cc 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -751,7 +751,7 @@ AVCodec ff_dvvideo_encoder = { .priv_data_size = sizeof(DVVideoContext), .init = dvvideo_encode_init, .encode2 = dvvideo_encode_frame, - .capabilities = CODEC_CAP_SLICE_THREADS | CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, + .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .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 19c479d..f6edc03 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -370,5 +370,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 22e7b2f..62bdd32 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -752,5 +752,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 d1b7c68..047be81 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -242,5 +242,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 f19dbc8..70d65be 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -348,5 +348,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 998f0a6..d86cc7b 100644 --- a/libavcodec/eatgq.c +++ b/libavcodec/eatgq.c @@ -249,5 +249,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 835ff15..882bf07 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -364,5 +364,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 d69ba5b..2423e21 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -162,5 +162,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/error_resilience.c b/libavcodec/error_resilience.c index df4a64d..b3b46d1 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -777,7 +777,7 @@ void ff_er_frame_start(ERContext *s) static int er_supported(ERContext *s) { if(s->avctx->hwaccel && s->avctx->hwaccel->decode_slice || - s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU || + s->avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU || !s->cur_pic.f || s->cur_pic.field_picture ) diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index 2816741..efcac64 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -373,5 +373,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 129011b..f4f64d8 100644 --- a/libavcodec/escape130.c +++ b/libavcodec/escape130.c @@ -356,5 +356,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/evrcdec.c b/libavcodec/evrcdec.c index cb1b509..cbbc629 100644 --- a/libavcodec/evrcdec.c +++ b/libavcodec/evrcdec.c @@ -935,7 +935,7 @@ AVCodec ff_evrc_decoder = { .id = AV_CODEC_ID_EVRC, .init = evrc_decode_init, .decode = evrc_decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .priv_data_size = sizeof(EVRCContext), .priv_class = &evrcdec_class, }; diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 9308ae0..b9de7c1 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1447,7 +1447,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 cc7c605..f84a4fb 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -1110,6 +1110,6 @@ AVCodec ff_ffv1_decoder = { .decode = decode_frame, .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), - .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/ | - CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS, + .capabilities = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/ | + AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, }; diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 525cd39..e1322c0 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -1369,7 +1369,7 @@ AVCodec ff_ffv1_encoder = { .init = encode_init, .encode2 = encode_frame, .close = encode_close, - .capabilities = CODEC_CAP_SLICE_THREADS | CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_DELAY, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV411P, diff --git a/libavcodec/ffwavesynth.c b/libavcodec/ffwavesynth.c index e835934..9d055e4 100644 --- a/libavcodec/ffwavesynth.c +++ b/libavcodec/ffwavesynth.c @@ -477,5 +477,5 @@ AVCodec ff_ffwavesynth_decoder = { .init = wavesynth_init, .close = wavesynth_close, .decode = wavesynth_decode, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/fic.c b/libavcodec/fic.c index b5f92e5..b58b017 100644 --- a/libavcodec/fic.c +++ b/libavcodec/fic.c @@ -476,6 +476,6 @@ 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, .priv_class = &fic_decoder_class, }; diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 30fe416..8653da7 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -665,7 +665,7 @@ AVCodec ff_flac_decoder = { .close = flac_decode_close, .decode = flac_decode_frame, .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .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 d3ac1b2..be791b3 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1475,7 +1475,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 | CODEC_CAP_LOSSLESS, + .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_LOSSLESS, .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 f429167..69b56d1 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -509,7 +509,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 */ @@ -572,7 +572,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 08dd98b..8570303 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -814,5 +814,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 fd1971b..f74ba3f 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -122,7 +122,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, .max_lowres = 3, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 8e40532..14f2ea2 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -122,7 +122,7 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){ if( !(avctx->thread_type & FF_THREAD_FRAME) - || !(avctx->codec->capabilities & CODEC_CAP_INTRA_ONLY)) + || !(avctx->codec->capabilities & AV_CODEC_CAP_INTRA_ONLY)) return 0; if( !avctx->thread_count diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index c49866e..8dcd0ae 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -322,5 +322,5 @@ AVCodec ff_fraps_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/frwu.c b/libavcodec/frwu.c index c778dbd..db4c1ba 100644 --- a/libavcodec/frwu.c +++ b/libavcodec/frwu.c @@ -123,6 +123,6 @@ AVCodec ff_frwu_decoder = { .priv_data_size = sizeof(FRWUContext), .init = decode_init, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .priv_class = &frwu_class, }; diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 22efd75..3682d26 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -1630,6 +1630,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 22e90a3..0bfa82a 100644 --- a/libavcodec/g722dec.c +++ b/libavcodec/g722dec.c @@ -145,6 +145,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 cd27fa0..01a3db2 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -389,7 +389,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 1b7bdd3..4a73c3c 100644 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -1337,7 +1337,7 @@ 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 ee065f4..934d120 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -392,7 +392,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 = &g726_class, @@ -477,7 +477,7 @@ 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 @@ -490,7 +490,7 @@ AVCodec ff_adpcm_g726le_decoder = { .init = g726_decode_init, .decode = g726_decode_frame, .flush = g726_decode_flush, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM little-endian"), }; #endif diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index ed717ba..99053ad 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -722,5 +722,5 @@ AVCodec ff_g729_decoder = { .priv_data_size = sizeof(G729Context), .init = decoder_init, .decode = decode_frame, - .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index c179f45..9f2e6eb 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -553,6 +553,6 @@ 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, .priv_class = &decoder_class, }; diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index c4cde92..cd56995 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -120,7 +120,7 @@ AVCodec ff_gsm_decoder = { .init = gsm_init, .decode = gsm_decode_frame, .flush = gsm_flush, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; #endif #if CONFIG_GSM_MS_DECODER @@ -133,6 +133,6 @@ AVCodec ff_gsm_ms_decoder = { .init = gsm_init, .decode = gsm_decode_frame, .flush = gsm_flush, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; #endif diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 4f5994a..df60ac5 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -685,6 +685,6 @@ 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, .max_lowres = 3, }; diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 86417bd..c173152 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -603,7 +603,7 @@ retry: if (!s->divx_packed && !avctx->hwaccel) ff_thread_finish_setup(avctx); - if (CONFIG_MPEG4_VDPAU_DECODER && (s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)) { + if (CONFIG_MPEG4_VDPAU_DECODER && (s->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU)) { ff_vdpau_mpeg4_decode_picture(avctx->priv_data, s->gb.buffer, s->gb.buffer_end - s->gb.buffer); goto frame_end; } @@ -736,8 +736,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, .max_lowres = 3, .pix_fmts = ff_h263_hwaccel_pixfmt_list_420, @@ -752,8 +752,8 @@ AVCodec ff_h263p_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, .max_lowres = 3, .pix_fmts = ff_h263_hwaccel_pixfmt_list_420, diff --git a/libavcodec/h264.c b/libavcodec/h264.c index cb4b6c1..abf1723 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1562,7 +1562,7 @@ again: (ret = h->avctx->hwaccel->start_frame(h->avctx, buf, buf_size)) < 0) goto end; if (CONFIG_H264_VDPAU_DECODER && - h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) + h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU) ff_vdpau_h264_picture_start(h); } @@ -1574,7 +1574,7 @@ again: if (ret < 0) goto end; } else if (CONFIG_H264_VDPAU_DECODER && - h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) { + h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU) { ff_vdpau_add_data_chunk(h->cur_pic_ptr->f->data[0], start_code, sizeof(start_code)); @@ -1981,9 +1981,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), @@ -2008,7 +2008,7 @@ AVCodec ff_h264_vdpau_decoder = { .init = ff_h264_decode_init, .close = h264_decode_end, .decode = h264_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HWACCEL_VDPAU, .flush = flush_dpb, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VDPAU_H264, AV_PIX_FMT_NONE}, diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index bf1471d..81d90d7 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -158,7 +158,7 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup) h->mb_y = 0; if (CONFIG_H264_VDPAU_DECODER && - h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) + h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU) ff_vdpau_h264_set_reference_frames(h); if (in_setup || !(avctx->active_thread_type & FF_THREAD_FRAME)) { @@ -178,7 +178,7 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup) } if (CONFIG_H264_VDPAU_DECODER && - h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) + h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU) ff_vdpau_h264_picture_complete(h); #if CONFIG_ERROR_RESILIENCE diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index cfbe88e..556b7b9 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -613,7 +613,7 @@ static int h264_frame_start(H264Context *h) if ((ret = alloc_picture(h, pic)) < 0) return ret; if(!h->frame_recovered && !h->avctx->hwaccel && - !(h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)) + !(h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU)) avpriv_color_frame(pic->f, c); h->cur_pic_ptr = pic; @@ -1045,7 +1045,7 @@ static int h264_slice_header_init(H264Context *h) } if (h->avctx->codec && - h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU && + h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU && (h->sps.bit_depth_luma != 8 || h->sps.chroma_format_idc > 1)) { av_log(h->avctx, AV_LOG_ERROR, "VDPAU decoding does not support video colorspace.\n"); @@ -2524,7 +2524,7 @@ int ff_h264_execute_decode_slices(H264Context *h, unsigned context_count) h->slice_ctx[0].next_slice_idx = INT_MAX; if (h->avctx->hwaccel || - h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) + h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU) return 0; if (context_count == 1) { int ret; diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c index f4f6ef6..5c2c20b 100644 --- a/libavcodec/hapdec.c +++ b/libavcodec/hapdec.c @@ -432,8 +432,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 157cdae..7f79189 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -3315,7 +3315,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_SLICE_THREADS | CODEC_CAP_FRAME_THREADS, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | + AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, .profiles = NULL_IF_CONFIG_SMALL(profiles), }; diff --git a/libavcodec/hnm4video.c b/libavcodec/hnm4video.c index 31995bc..a64dbb1 100644 --- a/libavcodec/hnm4video.c +++ b/libavcodec/hnm4video.c @@ -510,5 +510,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 906e66c..3ef83d4 100644 --- a/libavcodec/hq_hqa.c +++ b/libavcodec/hq_hqa.c @@ -381,7 +381,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 44016ac..8060c7a 100644 --- a/libavcodec/hqx.c +++ b/libavcodec/hqx.c @@ -536,7 +536,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 4751bb0..a6ba96b 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -1243,8 +1243,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), }; @@ -1258,8 +1258,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/huffyuvenc.c b/libavcodec/huffyuvenc.c index 9c41f52..65d2520 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -1073,7 +1073,7 @@ AVCodec ff_huffyuv_encoder = { .init = encode_init, .encode2 = encode_frame, .close = encode_end, - .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, + .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .priv_class = &normal_class, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24, @@ -1093,7 +1093,7 @@ AVCodec ff_ffvhuff_encoder = { .init = encode_init, .encode2 = encode_frame, .close = encode_end, - .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, + .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .priv_class = &ff_class, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV411P, diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c index 55319e5..4a0a6fb 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -248,5 +248,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 03bb3f5..4f947bf 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -887,7 +887,7 @@ AVCodec ff_iff_ilbm_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; #endif #if CONFIG_IFF_BYTERUN1_DECODER @@ -900,6 +900,6 @@ AVCodec ff_iff_byterun1_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; #endif diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 411dd9c..2910d30 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -1085,7 +1085,7 @@ AVCodec ff_imc_decoder = { .close = imc_decode_close, .decode = imc_decode_frame, .flush = flush, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; @@ -1101,7 +1101,7 @@ AVCodec ff_iac_decoder = { .close = imc_decode_close, .decode = imc_decode_frame, .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/indeo2.c b/libavcodec/indeo2.c index 39735c2..74135b9 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -252,5 +252,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 3d0f906..3f31946 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -1142,5 +1142,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 1c2491d..0065b52 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -704,5 +704,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 7474863..5f931c8 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -688,5 +688,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 71e0112..33f7ffd 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -136,7 +136,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 2106419..a29b5fe 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -1048,5 +1048,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/j2kenc.c b/libavcodec/j2kenc.c index 4777c6b..001718d 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1159,7 +1159,7 @@ AVCodec ff_jpeg2000_encoder = { .init = j2kenc_init, .encode2 = encode_frame, .close = j2kenc_destroy, - .capabilities = CODEC_CAP_EXPERIMENTAL, + .capabilities = AV_CODEC_CAP_EXPERIMENTAL, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB24, AV_PIX_FMT_YUV444P, AV_PIX_FMT_GRAY8, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index d579154..25653e0 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2159,7 +2159,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 2ea75f7..68151cb 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -523,6 +523,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/jpeglsenc.c b/libavcodec/jpeglsenc.c index 0edad14..4e8cd63 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -438,7 +438,7 @@ AVCodec ff_jpegls_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_JPEGLS, .init = encode_init_ls, - .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, + .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .encode2 = encode_picture_ls, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB24, diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c index 9c4a8d4..cbe83d3 100644 --- a/libavcodec/jvdec.c +++ b/libavcodec/jvdec.c @@ -231,5 +231,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 4f9329f..5359411 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -183,5 +183,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 f879c35..7acaba7 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -421,5 +421,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 2c6d70c..94d723d 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -748,5 +748,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 1d94041..a774832 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -660,7 +660,7 @@ AVCodec ff_mszh_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; #endif @@ -674,6 +674,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/lclenc.c b/libavcodec/lclenc.c index 7a9fa35..a6efba5 100644 --- a/libavcodec/lclenc.c +++ b/libavcodec/lclenc.c @@ -195,7 +195,7 @@ AVCodec ff_zlib_encoder = { .init = encode_init, .encode2 = encode_frame, .close = encode_end, - .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, + .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, diff --git a/libavcodec/libcelt_dec.c b/libavcodec/libcelt_dec.c index 4e62fe5..878e4cc 100644 --- a/libavcodec/libcelt_dec.c +++ b/libavcodec/libcelt_dec.c @@ -136,5 +136,5 @@ AVCodec ff_libcelt_decoder = { .init = libcelt_dec_init, .close = libcelt_dec_close, .decode = libcelt_dec_decode, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/libdcadec.c b/libavcodec/libdcadec.c index 62a3672..72fae62 100644 --- a/libavcodec/libdcadec.c +++ b/libavcodec/libdcadec.c @@ -260,7 +260,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 98193b4..3d8a354 100644 --- a/libavcodec/libfaac.c +++ b/libavcodec/libfaac.c @@ -240,7 +240,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 f7fc811..2488199 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -415,6 +415,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 6896a05..9e844ff 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -417,7 +417,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 8740108..a503215 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, }; #endif #if CONFIG_LIBGSM_MS_DECODER @@ -148,6 +148,6 @@ 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, }; #endif diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c index c1e01e1..c4c054f 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/libkvazaar.c b/libavcodec/libkvazaar.c index 6742090..9fb5be7 100644 --- a/libavcodec/libkvazaar.c +++ b/libavcodec/libkvazaar.c @@ -235,7 +235,7 @@ AVCodec ff_libkvazaar_encoder = { .long_name = NULL_IF_CONFIG_SMALL("libkvazaar H.265 / HEVC"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_HEVC, - .capabilities = CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DELAY, .pix_fmts = pix_fmts, .priv_class = &class, diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 443c7d5..05f7c5c 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -308,7 +308,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 7f0c958..f0e3426 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -135,7 +135,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 */ @@ -287,7 +287,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 = &amrnb_class, @@ -372,7 +372,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 50d4453..300e245 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 7f28e87..644e06c 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -439,7 +439,7 @@ static av_cold void libopenjpeg_static_init(AVCodec *codec) int major, minor; if (sscanf(version, "%d.%d", &major, &minor) == 2 && 1000*major + minor <= 1003) - codec->capabilities |= CODEC_CAP_EXPERIMENTAL; + codec->capabilities |= AV_CODEC_CAP_EXPERIMENTAL; } #define OFFSET(x) offsetof(LibOpenJPEGContext, x) @@ -466,7 +466,7 @@ 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, .max_lowres = 31, .priv_class = &openjpeg_class, .init_static_data = libopenjpeg_static_init, diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 4912515..d7ba868 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -649,7 +649,7 @@ AVCodec ff_libopenjpeg_encoder = { .init = libopenjpeg_encode_init, .encode2 = libopenjpeg_encode_frame, .close = libopenjpeg_encode_close, - .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, + .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64, AV_PIX_FMT_GBR24P, diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c index 8436302..4cbd14a 100644 --- a/libavcodec/libopusdec.c +++ b/libavcodec/libopusdec.c @@ -191,7 +191,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 da59988..072779b 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -438,7 +438,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 8778869..6ddb811 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -383,6 +383,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 1e18bf5..d70552e 100644 --- a/libavcodec/libschroedingerenc.c +++ b/libavcodec/libschroedingerenc.c @@ -449,7 +449,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/libshine.c b/libavcodec/libshine.c index 27c1a5f..b9f69a1 100644 --- a/libavcodec/libshine.c +++ b/libavcodec/libshine.c @@ -139,7 +139,7 @@ AVCodec ff_libshine_encoder = { .init = libshine_encode_init, .encode2 = libshine_encode_frame, .close = libshine_encode_close, - .capabilities = CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, .supported_samplerates = libshine_sample_rates, diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c index 6ca592a..044883a 100644 --- a/libavcodec/libspeexdec.c +++ b/libavcodec/libspeexdec.c @@ -199,5 +199,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 9486ab1..53d76c3 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -356,7 +356,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/libstagefright.cpp b/libavcodec/libstagefright.cpp index 11d6038..9ea96f3 100644 --- a/libavcodec/libstagefright.cpp +++ b/libavcodec/libstagefright.cpp @@ -568,7 +568,7 @@ AVCodec ff_libstagefright_h264_decoder = { NULL_IF_CONFIG_SMALL("libstagefright H.264"), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264, - CODEC_CAP_DELAY, + AV_CODEC_CAP_DELAY, NULL, //supported_framerates NULL, //pix_fmts NULL, //supported_samplerates diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index 5042f39..c581b34 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -379,7 +379,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 72edb3d..12d71e7 100644 --- a/libavcodec/libtwolame.c +++ b/libavcodec/libtwolame.c @@ -211,7 +211,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/libutvideoenc.cpp b/libavcodec/libutvideoenc.cpp index d574ab0..8ad6e7c 100644 --- a/libavcodec/libutvideoenc.cpp +++ b/libavcodec/libutvideoenc.cpp @@ -224,7 +224,7 @@ AVCodec ff_libutvideo_encoder = { NULL_IF_CONFIG_SMALL("Ut Video"), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_UTVIDEO, - CODEC_CAP_AUTO_THREADS | CODEC_CAP_LOSSLESS, + AV_CODEC_CAP_AUTO_THREADS | AV_CODEC_CAP_LOSSLESS, NULL, /* supported_framerates */ (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUYV422, AV_PIX_FMT_BGR24, diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c index 66e4c02..7715d1c 100644 --- a/libavcodec/libvo-aacenc.c +++ b/libavcodec/libvo-aacenc.c @@ -194,7 +194,7 @@ AVCodec ff_libvo_aacenc_encoder = { .encode2 = aac_encode_frame, .close = aac_encode_close, .supported_samplerates = mpeg4audio_sample_rates, - .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/libvorbisdec.c b/libavcodec/libvorbisdec.c index db00572..2b22e05 100644 --- a/libavcodec/libvorbisdec.c +++ b/libavcodec/libvorbisdec.c @@ -203,5 +203,5 @@ AVCodec ff_libvorbis_decoder = { .init = oggvorbis_decode_init, .decode = oggvorbis_decode_frame, .close = oggvorbis_decode_close, - .capabilities = CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DELAY, }; diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index 5859e21..00a5131 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -372,7 +372,7 @@ AVCodec ff_libvorbis_encoder = { .init = libvorbis_encode_init, .encode2 = libvorbis_encode_frame, .close = libvorbis_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_FLTP, AV_SAMPLE_FMT_NONE }, .priv_class = &vorbis_class, diff --git a/libavcodec/libvpx.c b/libavcodec/libvpx.c index 5aa27ab..a60d186 100644 --- a/libavcodec/libvpx.c +++ b/libavcodec/libvpx.c @@ -62,7 +62,7 @@ av_cold void ff_vp9_init_static(AVCodec *codec) { if ( vpx_codec_version_major() < 1 || (vpx_codec_version_major() == 1 && vpx_codec_version_minor() < 3)) - codec->capabilities |= CODEC_CAP_EXPERIMENTAL; + codec->capabilities |= AV_CODEC_CAP_EXPERIMENTAL; codec->pix_fmts = vp9_pix_fmts_def; #if CONFIG_LIBVPX_VP9_ENCODER if ( vpx_codec_version_major() > 1 diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index 33af775..52a89ca 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -217,7 +217,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 */ @@ -244,7 +244,7 @@ AVCodec ff_libvpx_vp9_decoder = { .init = vp9_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, .init_static_data = ff_vp9_init_static, .profiles = NULL_IF_CONFIG_SMALL(profiles), }; diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 47f9254..fb412b7 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1041,7 +1041,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_YUVA420P, AV_PIX_FMT_NONE }, .priv_class = &class_vp8, .defaults = defaults, @@ -1078,7 +1078,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, .profiles = NULL_IF_CONFIG_SMALL(profiles), .priv_class = &class_vp9, .defaults = defaults, diff --git a/libavcodec/libwavpackenc.c b/libavcodec/libwavpackenc.c index 77d98a2..6d57089 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/libwebpenc_animencoder.c b/libavcodec/libwebpenc_animencoder.c index e958201..e050647 100644 --- a/libavcodec/libwebpenc_animencoder.c +++ b/libavcodec/libwebpenc_animencoder.c @@ -139,7 +139,7 @@ AVCodec ff_libwebp_anim_encoder = { .init = libwebp_anim_encode_init, .encode2 = libwebp_anim_encode_frame, .close = libwebp_anim_encode_close, - .capabilities = CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DELAY, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB32, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVA420P, diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index e6c13d8..5da816e 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -930,7 +930,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 = &x264_class, .defaults = x264_defaults, .init_static_data = X264_init_static, @@ -947,7 +947,7 @@ AVCodec ff_libx264rgb_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 = &rgbclass, .defaults = x264_defaults, .pix_fmts = pix_fmts_8bit_rgb, @@ -971,7 +971,7 @@ AVCodec ff_libx262_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 = &X262_class, .defaults = x264_defaults, .pix_fmts = pix_fmts_8bit, diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 8afef26..f4f0548 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 8fb9116..14a6adf 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -462,7 +462,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 = &xavs_class, .defaults = xavs_defaults, diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index 15c1a5d..32d983c 100644 --- a/libavcodec/libzvbi-teletextdec.c +++ b/libavcodec/libzvbi-teletextdec.c @@ -565,7 +565,7 @@ AVCodec ff_libzvbi_teletext_decoder = { .init = teletext_init_decoder, .close = teletext_close_decoder, .decode = teletext_decode_frame, - .capabilities = CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DELAY, .flush = teletext_flush, .priv_class= &teletext_class, }; diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index e0a149a..70574b6 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -326,7 +326,7 @@ AVCodec ff_ljpeg_encoder = { .init = ljpeg_encode_init, .encode2 = ljpeg_encode_frame, .close = ljpeg_encode_close, - .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, + .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24 , AV_PIX_FMT_BGRA , AV_PIX_FMT_BGR0, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P, diff --git a/libavcodec/loco.c b/libavcodec/loco.c index aea478d..9d0f144 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -330,5 +330,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 6eaa296..e332a72 100644 --- a/libavcodec/mace.c +++ b/libavcodec/mace.c @@ -292,7 +292,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 }, }; @@ -305,7 +305,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 e398d34..ee96614 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -262,6 +262,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 2dab135..5a7f4c3 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 73f2a13..f5853b5 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -479,7 +479,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 8ac60c2..a858707 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -166,7 +166,7 @@ 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, .max_lowres = 3, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index cc82a43..7a0f02c 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2404,7 +2404,7 @@ AVCodec ff_mjpeg_decoder = { .close = ff_mjpeg_decode_end, .decode = ff_mjpeg_decode_frame, .flush = decode_flush, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .max_lowres = 3, .priv_class = &mjpegdec_class, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, @@ -2421,7 +2421,7 @@ AVCodec ff_thp_decoder = { .close = ff_mjpeg_decode_end, .decode = ff_mjpeg_decode_frame, .flush = decode_flush, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .max_lowres = 3, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index c3ede07..ee0b16e 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -269,7 +269,7 @@ AVCodec ff_mjpeg_encoder = { .init = ff_mpv_encode_init, .encode2 = ff_mpv_encode_picture, .close = ff_mpv_encode_end, - .capabilities = CODEC_CAP_SLICE_THREADS | CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, + .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE }, diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 490d107..1687ce8 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -1314,7 +1314,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, }; #endif #if CONFIG_TRUEHD_DECODER @@ -1326,6 +1326,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 aa46621..66f809f 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 8b04965..04de6bb 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -247,5 +247,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 84517f9..a88b837 100644 --- a/libavcodec/motionpixels.c +++ b/libavcodec/motionpixels.c @@ -351,5 +351,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 0f1e34a..d38b22a 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 29c65f9..a8feb6c 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -440,7 +440,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 fcf910f..363ce61 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2848,9 +2848,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, .max_lowres = 3, .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg_decode_update_thread_context) @@ -2865,9 +2865,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, .max_lowres = 3, .profiles = NULL_IF_CONFIG_SMALL(mpeg2_video_profiles), @@ -2883,7 +2883,7 @@ AVCodec ff_mpegvideo_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, .max_lowres = 3, }; @@ -2916,8 +2916,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 | AV_CODEC_CAP_HWACCEL | + AV_CODEC_CAP_DELAY, .flush = flush, }; @@ -2934,8 +2935,8 @@ AVCodec ff_mpeg_vdpau_decoder = { .init = mpeg_decode_init, .close = mpeg_decode_end, .decode = mpeg_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | - CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED | + AV_CODEC_CAP_HWACCEL_VDPAU | AV_CODEC_CAP_DELAY, .flush = flush, }; #endif @@ -2950,8 +2951,8 @@ AVCodec ff_mpeg1_vdpau_decoder = { .init = mpeg_decode_init, .close = mpeg_decode_end, .decode = mpeg_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | - CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED | + AV_CODEC_CAP_HWACCEL_VDPAU | AV_CODEC_CAP_DELAY, .flush = flush, }; #endif diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index c009677..8bf8e51 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1155,7 +1155,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, }; @@ -1172,6 +1172,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 18ec39e..7e4f9a2 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2778,9 +2778,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, .max_lowres = 3, .pix_fmts = ff_h263_hwaccel_pixfmt_list_420, @@ -2807,8 +2807,8 @@ AVCodec ff_mpeg4_vdpau_decoder = { .init = decode_init, .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | - CODEC_CAP_HWACCEL_VDPAU, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY | + AV_CODEC_CAP_HWACCEL_VDPAU, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VDPAU_MPEG4, AV_PIX_FMT_NONE }, .priv_class = &mpeg4_vdpau_class, diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 459dfe6..ffa08be 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1417,6 +1417,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 904c885..9421ffb 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 f432c83..ddfa5e0 100644 --- a/libavcodec/mpegaudiodec_float.c +++ b/libavcodec/mpegaudiodec_float.c @@ -48,7 +48,7 @@ AVCodec ff_mp1float_decoder = { .init = decode_init, .close = decode_close, .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, @@ -65,7 +65,7 @@ AVCodec ff_mp2float_decoder = { .init = decode_init, .decode = decode_frame, .close = decode_close, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .flush = flush, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT, @@ -82,7 +82,7 @@ AVCodec ff_mp3float_decoder = { .init = decode_init, .close = decode_close, .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, @@ -99,7 +99,7 @@ AVCodec ff_mp3adufloat_decoder = { .init = decode_init, .close = decode_close, .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, @@ -116,7 +116,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/mpegpicture.c b/libavcodec/mpegpicture.c index 30581f8..49cd6f0 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -58,7 +58,7 @@ int ff_mpeg_framesize_alloc(AVCodecContext *avctx, MotionEstContext *me, { int alloc_size = FFALIGN(FFABS(linesize) + 64, 32); - if (avctx->hwaccel || avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) + if (avctx->hwaccel || avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU) return 0; if (linesize < 24) { diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index dbe8200..1271275 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1307,7 +1307,7 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) return -1; } - if (!avctx->hwaccel && !(avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)) { + if (!avctx->hwaccel && !(avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU)) { for(i=0; i<avctx->height; i++) memset(s->last_picture_ptr->f->data[0] + s->last_picture_ptr->f->linesize[0]*i, 0x80, avctx->width); @@ -1652,7 +1652,7 @@ void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_ /* TODO: export all the following to make them accessible for users (and filters) */ if (avctx->hwaccel || !mbtype_table - || (avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)) + || (avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU)) return; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 83356a0..eb1daf2 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -4675,7 +4675,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 2feb2be..624946f 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -924,7 +924,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, .max_lowres = 3, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, @@ -941,7 +941,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, .max_lowres = 3, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, @@ -958,7 +958,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, .max_lowres = 3, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, @@ -975,7 +975,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, .max_lowres = 3, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index 260ad80..df9f795 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -166,5 +166,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 2eb67df..a579d9d 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 f788143..e4ff818 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -849,5 +849,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 075685b..0194196 100644 --- a/libavcodec/mss3.c +++ b/libavcodec/mss3.c @@ -869,5 +869,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 00c31dd..9639fc8 100644 --- a/libavcodec/mss4.c +++ b/libavcodec/mss4.c @@ -679,5 +679,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 88397be..891675f 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 69f0ee2..74f279a 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 05c74ee..2e3ebe6 100644 --- a/libavcodec/mxpegdec.c +++ b/libavcodec/mxpegdec.c @@ -343,7 +343,7 @@ 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, .max_lowres = 3, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index d3f23c8a..5f18593 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -205,7 +205,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 52ccc71..d7368d0 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -418,7 +418,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 e0cec52..6757b4d 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -347,5 +347,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.c b/libavcodec/nvenc.c index c5b63bf..6bd6b89 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1442,7 +1442,7 @@ AVCodec ff_nvenc_encoder = { .init = nvenc_encode_init, .encode2 = nvenc_encode_frame, .close = nvenc_encode_close, - .capabilities = CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DELAY, .priv_class = &nvenc_class, .defaults = nvenc_defaults, .pix_fmts = pix_fmts_nvenc, @@ -1467,7 +1467,7 @@ AVCodec ff_nvenc_h264_encoder = { .init = nvenc_encode_init, .encode2 = nvenc_encode_frame, .close = nvenc_encode_close, - .capabilities = CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DELAY, .priv_class = &nvenc_h264_class, .defaults = nvenc_defaults, .pix_fmts = pix_fmts_nvenc, @@ -1491,7 +1491,7 @@ AVCodec ff_nvenc_hevc_encoder = { .init = nvenc_encode_init, .encode2 = nvenc_encode_frame, .close = nvenc_encode_close, - .capabilities = CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DELAY, .priv_class = &nvenc_hevc_class, .defaults = nvenc_defaults, .pix_fmts = pix_fmts_nvenc, diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c index 6aeb1de..15f4dd1 100644 --- a/libavcodec/on2avc.c +++ b/libavcodec/on2avc.c @@ -1016,7 +1016,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 2ee3f2a..db2d5b9 100644 --- a/libavcodec/opusdec.c +++ b/libavcodec/opusdec.c @@ -683,5 +683,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 aaaef5e..12f473a 100644 --- a/libavcodec/pafaudio.c +++ b/libavcodec/pafaudio.c @@ -78,5 +78,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 a27afed..cab3129 100644 --- a/libavcodec/pafvideo.c +++ b/libavcodec/pafvideo.c @@ -393,5 +393,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 5819e53..e7f9ee4 100644 --- a/libavcodec/pcm-bluray.c +++ b/libavcodec/pcm-bluray.c @@ -307,7 +307,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 e729cb6..985a19b 100644 --- a/libavcodec/pcm-dvd.c +++ b/libavcodec/pcm-dvd.c @@ -311,7 +311,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 941d94f..81d9f92 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -501,7 +501,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 }, \ } @@ -523,7 +523,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 6487aa5..0e89388 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -239,5 +239,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 1bc51bc..ff6eb7f 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -263,5 +263,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 cb1cebb..7bba394 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1363,7 +1363,7 @@ AVCodec ff_apng_decoder = { .decode = decode_frame_apng, .init_thread_copy = ONLY_IF_THREADS_ENABLED(png_dec_init), .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS /*| CODEC_CAP_DRAW_HORIZ_BAND*/, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, }; #endif @@ -1379,6 +1379,6 @@ AVCodec ff_png_decoder = { .decode = decode_frame_png, .init_thread_copy = ONLY_IF_THREADS_ENABLED(png_dec_init), .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS /*| CODEC_CAP_DRAW_HORIZ_BAND*/, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, }; #endif diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index ddcd399..6bd996d 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -747,7 +747,7 @@ AVCodec ff_png_encoder = { .init = png_enc_init, .close = png_enc_close, .encode2 = encode_png, - .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, + .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_RGBA64BE, diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index e634500..d4261a4 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -265,7 +265,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 @@ -277,7 +277,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 @@ -289,7 +289,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 @@ -301,7 +301,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 @@ -313,6 +313,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/proresdec2.c b/libavcodec/proresdec2.c index 958b903..86c7b18 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -686,5 +686,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/proresdec_lgpl.c b/libavcodec/proresdec_lgpl.c index 4bdf392..9e5674e 100644 --- a/libavcodec/proresdec_lgpl.c +++ b/libavcodec/proresdec_lgpl.c @@ -780,5 +780,5 @@ AVCodec ff_prores_lgpl_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_anatoliy.c b/libavcodec/proresenc_anatoliy.c index ae6db65..41d83ca 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -614,7 +614,7 @@ AVCodec ff_prores_aw_encoder = { .close = prores_encode_close, .encode2 = prores_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUV422P10, AV_PIX_FMT_NONE}, - .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, + .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .profiles = profiles }; @@ -628,6 +628,6 @@ AVCodec ff_prores_encoder = { .close = prores_encode_close, .encode2 = prores_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUV422P10, AV_PIX_FMT_NONE}, - .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, + .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .profiles = profiles }; diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 684ae53..0631443 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -1347,7 +1347,7 @@ AVCodec ff_prores_ks_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 e3bcd29..5724715 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 406641a..5a3214c 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -331,7 +331,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 8c3abd7..42147f4 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -88,5 +88,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 22564ed..adb3e82 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -797,6 +797,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 a02c5e5..0b6dcd6 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1888,5 +1888,5 @@ AVCodec ff_qdm2_decoder = { .init = qdm2_decode_init, .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 838f836..0a31b41 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -339,5 +339,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 71f322b..9eaf9b8 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -351,5 +351,5 @@ AVCodec ff_qpeg_decoder = { .close = decode_end, .decode = decode_frame, .flush = decode_flush, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/qsvdec_h2645.c b/libavcodec/qsvdec_h2645.c index 38b972e..569b765 100644 --- a/libavcodec/qsvdec_h2645.c +++ b/libavcodec/qsvdec_h2645.c @@ -181,7 +181,7 @@ AVCodec ff_hevc_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 = &hevc_class, }; #endif @@ -216,7 +216,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/qsvdec_mpeg2.c b/libavcodec/qsvdec_mpeg2.c index 1385566..975dd9e 100644 --- a/libavcodec/qsvdec_mpeg2.c +++ b/libavcodec/qsvdec_mpeg2.c @@ -90,6 +90,6 @@ AVCodec ff_mpeg2_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, }; diff --git a/libavcodec/qsvdec_vc1.c b/libavcodec/qsvdec_vc1.c index d5258fc..a80fc83 100644 --- a/libavcodec/qsvdec_vc1.c +++ b/libavcodec/qsvdec_vc1.c @@ -83,6 +83,6 @@ AVCodec ff_vc1_qsv_decoder = { .decode = qsv_decode_frame, .flush = NULL, .close = qsv_decode_close, - .capabilities = CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DELAY, .priv_class = &class, }; diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index d35561d..95396fc 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -116,7 +116,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/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index ada3362..c7431e6 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -263,7 +263,7 @@ AVCodec ff_hevc_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/qsvenc_mpeg2.c b/libavcodec/qsvenc_mpeg2.c index 78200d3..6b28bfd 100644 --- a/libavcodec/qsvenc_mpeg2.c +++ b/libavcodec/qsvenc_mpeg2.c @@ -108,7 +108,7 @@ AVCodec ff_mpeg2_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 b367643..1fcf5b3 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -523,5 +523,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 fc9e7e5..9c868cd 100644 --- a/libavcodec/r210dec.c +++ b/libavcodec/r210dec.c @@ -103,7 +103,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 @@ -114,7 +114,7 @@ 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 #if CONFIG_AVRP_DECODER @@ -125,6 +125,6 @@ AVCodec ff_avrp_decoder = { .id = AV_CODEC_ID_AVRP, .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 29c7822..3eed17c 100644 --- a/libavcodec/ra144dec.c +++ b/libavcodec/ra144dec.c @@ -134,5 +134,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 d6cd8d5..32755d2 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -551,7 +551,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 }, .supported_samplerates = (const int[]){ 8000, 0 }, diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index 61d2777..00ce491 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -247,5 +247,5 @@ AVCodec ff_ra_288_decoder = { .init = ra288_decode_init, .decode = ra288_decode_frame, .close = ra288_decode_close, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c index 8a319ac..8cd9f88 100644 --- a/libavcodec/ralf.c +++ b/libavcodec/ralf.c @@ -530,7 +530,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/rawdec.c b/libavcodec/rawdec.c index 647dfa9..d8d77fc 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -372,5 +372,5 @@ AVCodec ff_rawvideo_decoder = { .close = raw_close_decoder, .decode = raw_decode, .priv_class = &rawdec_class, - .capabilities = CODEC_CAP_PARAM_CHANGE, + .capabilities = AV_CODEC_CAP_PARAM_CHANGE, }; diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c index eaf31b6..6662979 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -222,5 +222,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 3760514..5154604 100644 --- a/libavcodec/roqaudioenc.c +++ b/libavcodec/roqaudioenc.c @@ -198,7 +198,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 b716e25..68ef160 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -244,5 +244,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 732b09a..5faf562 100644 --- a/libavcodec/rpza.c +++ b/libavcodec/rpza.c @@ -280,5 +280,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 833e494..b56bb58 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -797,7 +797,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, .max_lowres = 3, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, @@ -814,7 +814,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, .max_lowres = 3, .pix_fmts = (const enum AVPixelFormat[]) { diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 1483107..f8c7ed4 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -291,8 +291,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 e9cd110..3ff1554 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -574,8 +574,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 24130d8..7891583 100644 --- a/libavcodec/s302m.c +++ b/libavcodec/s302m.c @@ -225,6 +225,6 @@ AVCodec ff_s302m_decoder = { .id = AV_CODEC_ID_S302M, .priv_data_size = sizeof(S302Context), .decode = s302m_decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .priv_class = &s302m_class, }; diff --git a/libavcodec/s302menc.c b/libavcodec/s302menc.c index 7ced674..fbaa845 100644 --- a/libavcodec/s302menc.c +++ b/libavcodec/s302menc.c @@ -173,6 +173,6 @@ AVCodec ff_s302m_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .capabilities = CODEC_CAP_VARIABLE_FRAME_SIZE | CODEC_CAP_EXPERIMENTAL, + .capabilities = AV_CODEC_CAP_VARIABLE_FRAME_SIZE | AV_CODEC_CAP_EXPERIMENTAL, .supported_samplerates = (const int[]) { 48000, 0 }, }; diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 2547abb..1aa002b 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -1525,5 +1525,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 3ddbf77..02ad1e1 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -296,5 +296,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 69d012e..e7b281a 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 5132aa5..65a6676 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -680,7 +680,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_U8P, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c index af1edf5..eb8b471 100644 --- a/libavcodec/sipr.c +++ b/libavcodec/sipr.c @@ -570,5 +570,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 b5538c7..6709f97 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -813,7 +813,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 = { @@ -823,5 +823,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 131300a..a423c45 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -472,5 +472,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/snowdec.c b/libavcodec/snowdec.c index 22499db..1b288dd 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -642,7 +642,7 @@ AVCodec ff_snow_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/, + .capabilities = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index c693743..4506379 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -1081,7 +1081,7 @@ AVCodec ff_sonic_decoder = { .init = sonic_decode_init, .close = sonic_decode_close, .decode = sonic_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_EXPERIMENTAL, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_EXPERIMENTAL, }; #endif /* CONFIG_SONIC_DECODER */ @@ -1095,7 +1095,7 @@ AVCodec ff_sonic_encoder = { .init = sonic_encode_init, .encode2 = sonic_encode_frame, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .capabilities = CODEC_CAP_EXPERIMENTAL, + .capabilities = AV_CODEC_CAP_EXPERIMENTAL, .close = sonic_encode_close, }; #endif @@ -1110,7 +1110,7 @@ AVCodec ff_sonic_ls_encoder = { .init = sonic_encode_init, .encode2 = sonic_encode_frame, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .capabilities = CODEC_CAP_EXPERIMENTAL, + .capabilities = AV_CODEC_CAP_EXPERIMENTAL, .close = sonic_encode_close, }; #endif diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index 5925c01..815f9ad 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -104,7 +104,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, .max_lowres = 3, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; @@ -120,7 +120,7 @@ AVCodec ff_amv_decoder = { .close = ff_mjpeg_decode_end, .decode = sp5x_decode_frame, .max_lowres = 3, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index 3fbec1d..25e11f6 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -211,5 +211,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 a5a65a8..8bc4c0c 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 15383a7..57205c6 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1414,9 +1414,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 4225030..2acdb92 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -947,7 +947,7 @@ AVCodec ff_tak_decoder = { .decode = tak_decode_frame, .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .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 b0c9b55..215c0f5 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -303,5 +303,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/targa_y216dec.c b/libavcodec/targa_y216dec.c index 5f4eeaa..21b3d35 100644 --- a/libavcodec/targa_y216dec.c +++ b/libavcodec/targa_y216dec.c @@ -79,5 +79,5 @@ AVCodec ff_targa_y216_decoder = { .id = AV_CODEC_ID_TARGA_Y216, .init = y216_decode_init, .decode = y216_decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/tdsc.c b/libavcodec/tdsc.c index 8f0ebe7..63cd443 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 7c62208..df12ee3 100644 --- a/libavcodec/tiertexseqv.c +++ b/libavcodec/tiertexseqv.c @@ -265,5 +265,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 7a7f9b7..8dd31eb 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1388,5 +1388,5 @@ AVCodec ff_tiff_decoder = { .close = tiff_end, .decode = decode_frame, .init_thread_copy = ONLY_IF_THREADS_ENABLED(tiff_init), - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, }; diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index f5ecd5a..7056cdc 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -572,7 +572,7 @@ AVCodec ff_tiff_encoder = { .priv_data_size = sizeof(TiffEncoderContext), .init = encode_init, .close = encode_close, - .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, + .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .encode2 = encode_frame, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48LE, AV_PIX_FMT_PAL8, diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c index e525a73..b738fcb 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 660ecf5..b52a369 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -912,5 +912,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 f70c79c..75373a0 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -1023,5 +1023,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 f9e8602..d4ddfcb 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -362,5 +362,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 f9b325b..6b5e275 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -184,5 +184,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 92210f7..9bb7ab3 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 01584d9..273938f 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -425,6 +425,6 @@ AVCodec ff_tta_decoder = { .close = tta_decode_close, .decode = tta_decode_frame, .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .priv_class = &tta_decoder_class, }; diff --git a/libavcodec/ttaenc.c b/libavcodec/ttaenc.c index da1cc4f..0df1fcb 100644 --- a/libavcodec/ttaenc.c +++ b/libavcodec/ttaenc.c @@ -224,7 +224,7 @@ AVCodec ff_tta_encoder = { .init = tta_encode_init, .close = tta_encode_close, .encode2 = tta_encode_frame, - .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_LOSSLESS, + .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_LOSSLESS, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, diff --git a/libavcodec/twinvqdec.c b/libavcodec/twinvqdec.c index 3ea4dfa..5f4dd35 100644 --- a/libavcodec/twinvqdec.c +++ b/libavcodec/twinvqdec.c @@ -422,7 +422,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 43c2273..0c95faa 100644 --- a/libavcodec/txd.c +++ b/libavcodec/txd.c @@ -159,5 +159,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 d14603a..e6f4374 100644 --- a/libavcodec/ulti.c +++ b/libavcodec/ulti.c @@ -424,5 +424,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 6ccbeb0..d6de975 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1243,7 +1243,7 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) break; - if (avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) + if (avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU) break; if (!setup_hwaccel(avctx, ret, desc->name)) @@ -1471,7 +1471,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code avctx->frame_number = 0; avctx->codec_descriptor = avcodec_descriptor_get(avctx->codec_id); - if (avctx->codec->capabilities & CODEC_CAP_EXPERIMENTAL && + if ((avctx->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { const char *codec_string = av_codec_is_encoder(codec) ? "encoder" : "decoder"; AVCodec *codec2; @@ -1480,7 +1480,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code "add '-strict %d' if you want to use it.\n", codec_string, codec->name, FF_COMPLIANCE_EXPERIMENTAL); codec2 = av_codec_is_encoder(codec) ? avcodec_find_encoder(codec->id) : avcodec_find_decoder(codec->id); - if (!(codec2->capabilities & CODEC_CAP_EXPERIMENTAL)) + if (!(codec2->capabilities & AV_CODEC_CAP_EXPERIMENTAL)) av_log(avctx, AV_LOG_ERROR, "Alternatively use the non experimental %s '%s'.\n", codec_string, codec2->name); ret = AVERROR_EXPERIMENTAL; @@ -1511,7 +1511,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 (avctx->codec->max_lowres < avctx->lowres || avctx->lowres < 0) { @@ -1891,7 +1891,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; @@ -1926,13 +1926,13 @@ 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) { av_log(avctx, AV_LOG_ERROR, "more samples than frame size (avcodec_encode_audio2)\n"); ret = AVERROR(EINVAL); goto end; } - } 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); @@ -1954,7 +1954,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) @@ -2169,7 +2169,7 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, if ((avctx->flags&AV_CODEC_FLAG_PASS1) && avctx->stats_out) avctx->stats_out[0] = '\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; @@ -2216,7 +2216,7 @@ FF_ENABLE_DEPRECATION_WARNINGS 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 (needs_realloc && avpkt->data) { @@ -2296,7 +2296,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); @@ -2421,7 +2421,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)) { int did_split = av_packet_split_side_data(&tmp); ret = apply_param_change(avctx, &tmp); if (ret < 0) { @@ -2444,7 +2445,7 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi } //FIXME these should be under if(!avctx->has_b_frames) /* get_buffer is supposed to set frame parameters */ - if (!(avctx->codec->capabilities & CODEC_CAP_DR1)) { + if (!(avctx->codec->capabilities & AV_CODEC_CAP_DR1)) { if (!picture->sample_aspect_ratio.num) picture->sample_aspect_ratio = avctx->sample_aspect_ratio; if (!picture->width) picture->width = avctx->width; if (!picture->height) picture->height = avctx->height; @@ -2571,7 +2572,7 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, av_frame_unref(frame); - 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)) { uint8_t *side; int side_size; uint32_t discard_padding = 0; @@ -2799,7 +2800,7 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, *got_sub_ptr = 0; get_subtitle_defaults(sub); - if ((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size) { + if ((avctx->codec->capabilities & AV_CODEC_CAP_DELAY) || avpkt->size) { AVPacket pkt_recoded; AVPacket tmp = *avpkt; int did_split = av_packet_split_side_data(&tmp); @@ -2977,7 +2978,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 3a3c46e..ebce593 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -559,5 +559,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/utvideoenc.c b/libavcodec/utvideoenc.c index 5745971..efba538 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -638,7 +638,7 @@ AVCodec ff_utvideo_encoder = { .init = utvideo_encode_init, .encode2 = utvideo_encode_frame, .close = utvideo_encode_close, - .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, + .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index f1e968d..ab4bdcd 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -180,6 +180,6 @@ AVCodec ff_v210_decoder = { .priv_data_size = sizeof(V210DecContext), .init = decode_init, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .priv_class = &v210dec_class, }; diff --git a/libavcodec/v210x.c b/libavcodec/v210x.c index 6330715..f6a453a 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/v308dec.c b/libavcodec/v308dec.c index 1d31f0a..dd53fbd 100644 --- a/libavcodec/v308dec.c +++ b/libavcodec/v308dec.c @@ -79,5 +79,5 @@ AVCodec ff_v308_decoder = { .id = AV_CODEC_ID_V308, .init = v308_decode_init, .decode = v308_decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/v408dec.c b/libavcodec/v408dec.c index be442fa..acff95d 100644 --- a/libavcodec/v408dec.c +++ b/libavcodec/v408dec.c @@ -87,7 +87,7 @@ AVCodec ff_ayuv_decoder = { .id = AV_CODEC_ID_AYUV, .init = v408_decode_init, .decode = v408_decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; #endif #if CONFIG_V408_DECODER @@ -98,6 +98,6 @@ AVCodec ff_v408_decoder = { .id = AV_CODEC_ID_V408, .init = v408_decode_init, .decode = v408_decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; #endif diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c index e7a9c0e..48fab68 100644 --- a/libavcodec/v410dec.c +++ b/libavcodec/v410dec.c @@ -94,5 +94,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 41ee42e..560165a 100644 --- a/libavcodec/vb.c +++ b/libavcodec/vb.c @@ -279,5 +279,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 fb98177..30b77ce 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -210,5 +210,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 3045ccf..6303fdf 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -647,7 +647,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, return buf_size; } - if (s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) { + if (s->avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU) { if (v->profile < PROFILE_ADVANCED) avctx->pix_fmt = AV_PIX_FMT_VDPAU_WMV3; else @@ -673,14 +673,14 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, switch (AV_RB32(start)) { case VC1_CODE_FRAME: if (avctx->hwaccel || - s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) + s->avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU) buf_start = start; buf_size2 = vc1_unescape_buffer(start + 4, size, buf2); break; case VC1_CODE_FIELD: { int buf_size3; if (avctx->hwaccel || - s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) + s->avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU) buf_start_second_field = start; tmp = av_realloc_array(slices, sizeof(*slices), (n_slices+1)); if (!tmp) @@ -734,7 +734,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, goto err; } else { // found field marker, unescape second field if (avctx->hwaccel || - s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) + s->avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU) buf_start_second_field = divider; tmp = av_realloc_array(slices, sizeof(*slices), (n_slices+1)); if (!tmp) @@ -874,7 +874,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, s->me.qpel_avg = s->qdsp.avg_qpel_pixels_tab; if ((CONFIG_VC1_VDPAU_DECODER) - &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) { + &&s->avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU) { if (v->field_mode && buf_start_second_field) { ff_vdpau_vc1_decode_picture(s, buf_start, buf_start_second_field - buf_start); ff_vdpau_vc1_decode_picture(s, buf_start_second_field, (buf + buf_size) - buf_start_second_field); @@ -1098,7 +1098,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) }; @@ -1114,7 +1114,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) }; @@ -1130,7 +1130,7 @@ AVCodec ff_wmv3_vdpau_decoder = { .init = vc1_decode_init, .close = ff_vc1_decode_end, .decode = vc1_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HWACCEL_VDPAU, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_WMV3, AV_PIX_FMT_NONE }, .profiles = NULL_IF_CONFIG_SMALL(profiles) }; @@ -1146,7 +1146,7 @@ AVCodec ff_vc1_vdpau_decoder = { .init = vc1_decode_init, .close = ff_vc1_decode_end, .decode = vc1_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HWACCEL_VDPAU, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_VC1, AV_PIX_FMT_NONE }, .profiles = NULL_IF_CONFIG_SMALL(profiles) }; @@ -1162,7 +1162,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, @@ -1181,7 +1181,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 f8281ea..28a5eec 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -129,5 +129,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/vda_h264_dec.c b/libavcodec/vda_h264_dec.c index c00e7e4..6935e18 100644 --- a/libavcodec/vda_h264_dec.c +++ b/libavcodec/vda_h264_dec.c @@ -267,7 +267,7 @@ AVCodec ff_h264_vda_decoder = { .init = vdadec_init, .close = vdadec_close, .decode = vdadec_decode, - .capabilities = CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_DELAY, .flush = vdadec_flush, .long_name = NULL_IF_CONFIG_SMALL("H.264 (VDA acceleration)"), }; diff --git a/libavcodec/vima.c b/libavcodec/vima.c index 74d6a9a..7800c66 100644 --- a/libavcodec/vima.c +++ b/libavcodec/vima.c @@ -214,7 +214,7 @@ 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, }; #if FF_API_VIMA_DECODER @@ -225,6 +225,6 @@ AVCodec ff_vima_decoder = { .id = AV_CODEC_ID_ADPCM_VIMA, .init = decode_init, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; #endif diff --git a/libavcodec/vmdaudio.c b/libavcodec/vmdaudio.c index 3be0ff8..e8c8a06 100644 --- a/libavcodec/vmdaudio.c +++ b/libavcodec/vmdaudio.c @@ -231,5 +231,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 a2ba1c9..b97032f 100644 --- a/libavcodec/vmdvideo.c +++ b/libavcodec/vmdvideo.c @@ -471,5 +471,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 58bd0e2..49abb77 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -577,5 +577,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 c191f31..a531a64 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1846,7 +1846,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 31a5ceb..2974ca2 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 397e895..f10fa5a 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2544,8 +2544,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) @@ -2561,8 +2561,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 1923d63..5bcf9b6 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -290,5 +290,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 e97ef76..a2bb457 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -679,7 +679,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 */ @@ -692,7 +692,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 */ @@ -705,5 +705,5 @@ AVCodec ff_vp6a_decoder = { .init = vp6_decode_init, .close = vp6_decode_free, .decode = ff_vp56_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, }; diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 25fe70a..4328f40 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2827,7 +2827,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 */ @@ -2842,7 +2842,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 5b5ad99..4503ed7 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -4358,7 +4358,7 @@ AVCodec ff_vp9_decoder = { .init = vp9_decode_init, .close = vp9_decode_free, .decode = vp9_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .flush = vp9_decode_flush, .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp9_decode_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(vp9_decode_update_thread_context), diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 45eb157..3ed9652 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -650,5 +650,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 554367b..bd51dba 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1125,5 +1125,5 @@ AVCodec ff_wavpack_decoder = { .decode = wavpack_decode_frame, .flush = wavpack_decode_flush, .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, }; diff --git a/libavcodec/wavpackenc.c b/libavcodec/wavpackenc.c index 0588167..6091e3f 100644 --- a/libavcodec/wavpackenc.c +++ b/libavcodec/wavpackenc.c @@ -2982,7 +2982,7 @@ AVCodec ff_wavpack_encoder = { .init = wavpack_encode_init, .encode2 = wavpack_encode_frame, .close = wavpack_encode_close, - .capabilities = CODEC_CAP_SMALL_LAST_FRAME, + .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 8caa6a2..5c2961f 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -1540,5 +1540,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 d60cf1f..381ec45 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -977,7 +977,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 }, }; @@ -993,7 +993,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 0c85c83..0ac5163 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -1299,7 +1299,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 22b10d7..f864426 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1666,7 +1666,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 fff1aa8..3a509cb 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -2084,6 +2084,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 d2b9b13..f8128dc 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -482,7 +482,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 fb9e9cf..d578199 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -155,5 +155,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 6929cbf..0f00580 100644 --- a/libavcodec/ws-snd1.c +++ b/libavcodec/ws-snd1.c @@ -177,5 +177,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 2c565ee..7184faa 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -644,5 +644,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 143e3a2..d19bdae 100644 --- a/libavcodec/xbmdec.c +++ b/libavcodec/xbmdec.c @@ -133,5 +133,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 2d1da1d..37ab46e 100644 --- a/libavcodec/xl.c +++ b/libavcodec/xl.c @@ -134,5 +134,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 62dfdac..2febedc 100644 --- a/libavcodec/xwddec.c +++ b/libavcodec/xwddec.c @@ -249,5 +249,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 b261cdf..5485296 100644 --- a/libavcodec/xxan.c +++ b/libavcodec/xxan.c @@ -447,5 +447,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/y41pdec.c b/libavcodec/y41pdec.c index 22c7d1f..1b177d4 100644 --- a/libavcodec/y41pdec.c +++ b/libavcodec/y41pdec.c @@ -88,5 +88,5 @@ AVCodec ff_y41p_decoder = { .id = AV_CODEC_ID_Y41P, .init = y41p_decode_init, .decode = y41p_decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/yuv4dec.c b/libavcodec/yuv4dec.c index 00ccf58..f89f62d 100644 --- a/libavcodec/yuv4dec.c +++ b/libavcodec/yuv4dec.c @@ -80,5 +80,5 @@ AVCodec ff_yuv4_decoder = { .id = AV_CODEC_ID_YUV4, .init = yuv4_decode_init, .decode = yuv4_decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c index 12d8024..55a9a91 100644 --- a/libavcodec/zerocodec.c +++ b/libavcodec/zerocodec.c @@ -148,5 +148,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 82ae169..25a1cd2 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -634,5 +634,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 fe3ff5a..831d90a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2722,7 +2722,7 @@ static int try_decode_frame(AVFormatContext *s, AVStream *st, AVPacket *avpkt, ret >= 0 && (!has_codec_parameters(st, NULL) || !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: @@ -3373,7 +3373,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. */ |
