History

textformat/tw_avio: Remove close_on_uninit param from create_file

avtextwriter_create_file() creates an AVIOContext whose pointer resides in its private context. If it were not always closed on uninit, the AVIOContext would leak, so it makes no sense to have this parameter.

Andreas Rheinhardt committed 1 year ago

Commit b9450581 parent f73badb3 files · +4 −4Browse files

Unified · Split

3 files
  1. fftools/ffprobe.c +1 −1
  2. fftools/textformat/avtextwriters.h +1 −1
  3. fftools/textformat/tw_avio.c +2 −2
fftools/ffprobe.c+1−1
@@ -3161,7 +3161,7 @@ int main(int argc, char **argv) · 3160 unmodified lines
31613161 }
31623162
31633163 if (output_filename) {
3164− ret = avtextwriter_create_file(&wctx, output_filename, 1);
3164+ ret = avtextwriter_create_file(&wctx, output_filename);
31653165 } else
31663166 ret = avtextwriter_create_stdout(&wctx);
31673167
fftools/textformat/avtextwriters.h+1−1
@@ -61,7 +61,7 @@ int avtextwriter_create_stdout(AVTextWriterContext **pwctx); · 60 unmodified lines
6161
6262 int avtextwriter_create_avio(AVTextWriterContext **pwctx, AVIOContext *avio_ctx, int close_on_uninit);
6363
64−int avtextwriter_create_file(AVTextWriterContext **pwctx, const char *output_filename, int close_on_uninit);
64+int avtextwriter_create_file(AVTextWriterContext **pwctx, const char *output_filename);
6565
6666 int avtextwriter_create_buffer(AVTextWriterContext **pwctx, AVBPrint *buffer);
6767
fftools/textformat/tw_avio.c+2−2
@@ -76,7 +76,7 @@ const AVTextWriter avtextwriter_avio = { · 75 unmodified lines
7676 .writer_w8 = io_w8
7777 };
7878
79−int avtextwriter_create_file(AVTextWriterContext **pwctx, const char *output_filename, int close_on_uninit)
79+int avtextwriter_create_file(AVTextWriterContext **pwctx, const char *output_filename)
8080 {
8181 IOWriterContext *ctx;
8282 int ret;
@@ -95,7 +95,7 @@ int avtextwriter_create_file(AVTextWriterContext **pwctx, const char *output_fil · 12 unmodified lines
9595 return ret;
9696 }
9797
98− ctx->close_on_uninit = close_on_uninit;
98+ ctx->close_on_uninit = 1;
9999
100100 return ret;
101101 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t