X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cmdutils.h;h=925df5014e98c2557b2c4d8547c88301d45b98e4;hb=a2cd13f04f0d06a6c0e4981043d1b22c6af3469b;hp=d99037cfb224154170ea1de608ee38249a1aaf40;hpb=052f4f859cfee9bb86ea3ccb0c56ea11d050ef17;p=ffmpeg diff --git a/cmdutils.h b/cmdutils.h index d99037cfb22..925df5014e9 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -232,10 +232,12 @@ int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec); * * @param s Corresponding format context. * @param st A stream from s for which the options should be filtered. + * @param codec The particular codec for which the options should be filtered. + * If null, the default one is looked up according to the codec id. * @return a pointer to the created dictionary */ -AVDictionary *filter_codec_opts(AVDictionary *opts, AVCodec *codec, - AVFormatContext *s, AVStream *st); +AVDictionary *filter_codec_opts(AVDictionary *opts, enum CodecID codec_id, + AVFormatContext *s, AVStream *st, AVCodec *codec); /** * Setup AVCodecContext options for avformat_find_stream_info(). @@ -374,7 +376,7 @@ FILE *get_preset_file(char *filename, size_t filename_size, * Do all the necessary cleanup and abort. * This function is implemented in the avtools, not cmdutils. */ -void exit_program(int ret); +av_noreturn void exit_program(int ret); /** * Realloc array to hold new_size elements of elem_size.