Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_demux: fix variable shadowing

Browse Source
release/7.1
Marvin Scholz 6 months ago
parent c59a073abe
commit 25f0fff9ec
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      fftools/ffmpeg_demux.c

10
fftools/ffmpeg_demux.c
Unescape View File

@ -1597,7 +1597,7 @@ int ifile_open(const OptionsContext *o, const char *filename, Scheduler *sch)
InputFile *f; InputFile *f;
AVFormatContext *ic; AVFormatContext *ic;
const AVInputFormat *file_iformat = NULL; const AVInputFormat *file_iformat = NULL;
int err, i, ret = 0; int err, ret = 0;
int64_t timestamp; int64_t timestamp;
AVDictionary *opts_used = NULL; AVDictionary *opts_used = NULL;
const char* video_codec_name = NULL; const char* video_codec_name = NULL;
@ -1752,7 +1752,7 @@ int ifile_open(const OptionsContext *o, const char *filename, Scheduler *sch)
return ret; return ret;
/* apply forced codec ids */ /* apply forced codec ids */
for (i = 0; i < ic->nb_streams; i++) { for (int i = 0; i < ic->nb_streams; i++) {
const AVCodec *dummy; const AVCodec *dummy;
ret = choose_decoder(o, f, ic, ic->streams[i], HWACCEL_NONE, AV_HWDEVICE_TYPE_NONE, ret = choose_decoder(o, f, ic, ic->streams[i], HWACCEL_NONE, AV_HWDEVICE_TYPE_NONE,
&dummy); &dummy);
@ -1772,7 +1772,7 @@ int ifile_open(const OptionsContext *o, const char *filename, Scheduler *sch)
first frames to get it. (used in mpeg case for example) */ first frames to get it. (used in mpeg case for example) */
ret = avformat_find_stream_info(ic, opts); ret = avformat_find_stream_info(ic, opts);
for (i = 0; i < orig_nb_streams; i++) for (int i = 0; i < orig_nb_streams; i++)
av_dict_free(&opts[i]); av_dict_free(&opts[i]);
av_freep(&opts); av_freep(&opts);
@ -1813,7 +1813,7 @@ int ifile_open(const OptionsContext *o, const char *filename, Scheduler *sch)
if (!(ic->iformat->flags & AVFMT_SEEK_TO_PTS)) { if (!(ic->iformat->flags & AVFMT_SEEK_TO_PTS)) {
int dts_heuristic = 0; int dts_heuristic = 0;
for (i=0; i<ic->nb_streams; i++) { for (int i = 0; i < ic->nb_streams; i++) {
const AVCodecParameters *par = ic->streams[i]->codecpar; const AVCodecParameters *par = ic->streams[i]->codecpar;
if (par->video_delay) { if (par->video_delay) {
dts_heuristic = 1; dts_heuristic = 1;
@ -1887,7 +1887,7 @@ int ifile_open(const OptionsContext *o, const char *filename, Scheduler *sch)
if (ret < 0) if (ret < 0)
return ret; return ret;
for (i = 0; i < o->dump_attachment.nb_opt; i++) { for (int i = 0; i < o->dump_attachment.nb_opt; i++) {
int j; int j;
for (j = 0; j < f->nb_streams; j++) { for (j = 0; j < f->nb_streams; j++) {

Write Preview
Loading…
Cancel
Save