avcodec/avcodec: Don't suggest calling deprecated avcodec_register_all()

Despite avcodec_register and avcodec_register_all being deprecated,
their documentation still said that one of them has to be called
before doing anything else. Clarify this confusing situation.

Furthermore, don't use avcodec_register_all in sample code for
a non-deprecated function.

Reviewed-by: mypopy@gmail.com <mypopy@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2021-02-26 04:59:59 +01:00
parent ea3953ad40
commit 136dd5b592

View File

@@ -2708,25 +2708,13 @@ const char *avcodec_license(void);
#if FF_API_NEXT #if FF_API_NEXT
/** /**
* Register the codec codec and initialize libavcodec. * @deprecated Calling this function is unnecessary.
*
* @warning either this function or avcodec_register_all() must be called
* before any other libavcodec functions.
*
* @see avcodec_register_all()
*/ */
attribute_deprecated attribute_deprecated
void avcodec_register(AVCodec *codec); void avcodec_register(AVCodec *codec);
/** /**
* Register all the codecs, parsers and bitstream filters which were enabled at * @deprecated Calling this function is unnecessary.
* configuration time. If you do not call this function you can select exactly
* which formats you want to support, by using the individual registration
* functions.
*
* @see avcodec_register
* @see av_register_codec_parser
* @see av_register_bitstream_filter
*/ */
attribute_deprecated attribute_deprecated
void avcodec_register_all(void); void avcodec_register_all(void);
@@ -2843,7 +2831,6 @@ int avcodec_parameters_to_context(AVCodecContext *codec,
* @ref avcodec_receive_frame()). * @ref avcodec_receive_frame()).
* *
* @code * @code
* avcodec_register_all();
* av_dict_set(&opts, "b", "2.5M", 0); * av_dict_set(&opts, "b", "2.5M", 0);
* codec = avcodec_find_decoder(AV_CODEC_ID_H264); * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
* if (!codec) * if (!codec)