virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/avformat, utils: Make av_find_best_stream const-correct

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-02-25 01:53:40 +01:00 committed by James Almer
parent 626535f6a1
commit 46dac8cf3d
8 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/APIchanges
View File

@ -14,6 +14,10 @@ libavutil: 2017-10-21
API changes, most recent first: API changes, most recent first:
2021-04-27 - xxxxxxxxxx - lavf yyyyyyyyy - avformat.h
av_find_best_stream now uses a const AVCodec ** parameter
for the returned decoder.
2021-04-27 - xxxxxxxxxx - lavc yyyyyyyyy - codec.h 2021-04-27 - xxxxxxxxxx - lavc yyyyyyyyy - codec.h
avcodec_find_encoder_by_name(), avcodec_find_encoder(), avcodec_find_encoder_by_name(), avcodec_find_encoder(),
avcodec_find_decoder_by_name() and avcodec_find_decoder() avcodec_find_decoder_by_name() and avcodec_find_decoder()

2
doc/examples/extract_mvs.c
View File

@ -78,7 +78,7 @@ static int open_codec_context(AVFormatContext *fmt_ctx, enum AVMediaType type)
int ret; int ret;
AVStream *st; AVStream *st;
AVCodecContext *dec_ctx = NULL; AVCodecContext *dec_ctx = NULL;
AVCodec *dec = NULL; const AVCodec *dec = NULL;
AVDictionary *opts = NULL; AVDictionary *opts = NULL;
ret = av_find_best_stream(fmt_ctx, type, -1, -1, &dec, 0); ret = av_find_best_stream(fmt_ctx, type, -1, -1, &dec, 0);

2
doc/examples/filtering_audio.c
View File

@ -48,8 +48,8 @@ static int audio_stream_index = -1;
static int open_input_file(const char *filename) static int open_input_file(const char *filename)
{ {
const AVCodec *dec;
int ret; int ret;
AVCodec *dec;
if ((ret = avformat_open_input(&fmt_ctx, filename, NULL, NULL)) < 0) { if ((ret = avformat_open_input(&fmt_ctx, filename, NULL, NULL)) < 0) {
av_log(NULL, AV_LOG_ERROR, "Cannot open input file\n"); av_log(NULL, AV_LOG_ERROR, "Cannot open input file\n");

2
doc/examples/filtering_video.c
View File

@ -53,8 +53,8 @@ static int64_t last_pts = AV_NOPTS_VALUE;
static int open_input_file(const char *filename) static int open_input_file(const char *filename)
{ {
const AVCodec *dec;
int ret; int ret;
AVCodec *dec;
if ((ret = avformat_open_input(&fmt_ctx, filename, NULL, NULL)) < 0) { if ((ret = avformat_open_input(&fmt_ctx, filename, NULL, NULL)) < 0) {
av_log(NULL, AV_LOG_ERROR, "Cannot open input file\n"); av_log(NULL, AV_LOG_ERROR, "Cannot open input file\n");

2
doc/examples/hw_decode.c
View File

@ -152,7 +152,7 @@ int main(int argc, char *argv[])
int video_stream, ret; int video_stream, ret;
AVStream *video = NULL; AVStream *video = NULL;
AVCodecContext *decoder_ctx = NULL; AVCodecContext *decoder_ctx = NULL;
AVCodec *decoder = NULL; const AVCodec *decoder = NULL;
AVPacket packet; AVPacket packet;
enum AVHWDeviceType type; enum AVHWDeviceType type;
int i; int i;

2
doc/examples/vaapi_transcode.c
View File

@ -62,7 +62,7 @@ static enum AVPixelFormat get_vaapi_format(AVCodecContext *ctx,
static int open_input_file(const char *filename) static int open_input_file(const char *filename)
{ {
int ret; int ret;
AVCodec *decoder = NULL; const AVCodec *decoder = NULL;
AVStream *video = NULL; AVStream *video = NULL;
if ((ret = avformat_open_input(&ifmt_ctx, filename, NULL, NULL)) < 0) { if ((ret = avformat_open_input(&ifmt_ctx, filename, NULL, NULL)) < 0) {

2
libavformat/avformat.h
View File

@ -2070,7 +2070,7 @@ int av_find_best_stream(AVFormatContext *ic,
enum AVMediaType type, enum AVMediaType type,
int wanted_stream_nb, int wanted_stream_nb,
int related_stream, int related_stream,
AVCodec **decoder_ret, const AVCodec **decoder_ret,
int flags); int flags);
/** /**

4
libavformat/utils.c
View File

@ -4200,7 +4200,7 @@ AVProgram *av_find_program_from_stream(AVFormatContext *ic, AVProgram *last, int
int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type, int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type,
int wanted_stream_nb, int related_stream, int wanted_stream_nb, int related_stream,
AVCodec **decoder_ret, int flags) const AVCodec **decoder_ret, int flags)
{ {
int i, nb_streams = ic->nb_streams; int i, nb_streams = ic->nb_streams;
int ret = AVERROR_STREAM_NOT_FOUND; int ret = AVERROR_STREAM_NOT_FOUND;
@ -4260,7 +4260,7 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type,
} }
} }
if (decoder_ret) if (decoder_ret)
*decoder_ret = (AVCodec*)best_decoder; *decoder_ret = best_decoder;
return ret; return ret;
} }