virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

lavf/format: use const AVInputFormat for iteration

Browse Source 
Signed-off-by: Josh de Kock <josh@itanimul.li>
This commit is contained in:
Josh de Kock 2018-04-01 03:17:07 +01:00
parent 85bf89885a
commit d1221f3351
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/format.c
View File

@ -117,11 +117,11 @@ enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
AVInputFormat *av_find_input_format(const char *short_name) AVInputFormat *av_find_input_format(const char *short_name)
{ {
AVInputFormat *fmt = NULL; const AVInputFormat *fmt = NULL;
void *i = 0; void *i = 0;
while ((fmt = av_demuxer_iterate(&i))) while ((fmt = av_demuxer_iterate(&i)))
if (av_match_name(short_name, fmt->name)) if (av_match_name(short_name, fmt->name))
return fmt; return (AVInputFormat*)fmt;
return NULL; return NULL;
} }
@ -129,7 +129,8 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened,
int *score_ret) int *score_ret)
{ {
AVProbeData lpd = *pd; AVProbeData lpd = *pd;
AVInputFormat *fmt1 = NULL, *fmt; const AVInputFormat *fmt1 = NULL;
AVInputFormat *fmt = NULL;
int score, score_max = 0; int score, score_max = 0;
void *i = 0; void *i = 0;
const static uint8_t zerobuffer[AVPROBE_PADDING_SIZE]; const static uint8_t zerobuffer[AVPROBE_PADDING_SIZE];
@ -156,7 +157,6 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened,
nodat = ID3_GREATER_PROBE; nodat = ID3_GREATER_PROBE;
} }
fmt = NULL;
while ((fmt1 = av_demuxer_iterate(&i))) { while ((fmt1 = av_demuxer_iterate(&i))) {
if (!is_opened == !(fmt1->flags & AVFMT_NOFILE) && strcmp(fmt1->name, "image2")) if (!is_opened == !(fmt1->flags & AVFMT_NOFILE) && strcmp(fmt1->name, "image2"))
continue; continue;
@ -191,7 +191,7 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened,
} }
if (score > score_max) { if (score > score_max) {
score_max = score; score_max = score;
fmt = fmt1; fmt = (AVInputFormat*)fmt1;
} else if (score == score_max) } else if (score == score_max)
fmt = NULL; fmt = NULL;
} }