mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 08:42:39 +00:00
Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c'
* commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c': avconv: check that the output format context exists before accessing it Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
4abd5a4318
2
ffmpeg.c
2
ffmpeg.c
@ -454,7 +454,7 @@ static void exit_program(void)
|
||||
/* close files */
|
||||
for (i = 0; i < nb_output_files; i++) {
|
||||
AVFormatContext *s = output_files[i]->ctx;
|
||||
if (s && !(s->oformat->flags & AVFMT_NOFILE) && s->pb)
|
||||
if (s && s->oformat && !(s->oformat->flags & AVFMT_NOFILE) && s->pb)
|
||||
avio_close(s->pb);
|
||||
avformat_free_context(s);
|
||||
av_dict_free(&output_files[i]->opts);
|
||||
|
Loading…
Reference in New Issue
Block a user