virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

Revert "fftools/textformat/avtextformat: Make close functions return void"

Browse Source 
This reverts commit 7684243fbe and
a888975a3c.
This commit is contained in:
Marton Balint
2025-05-07 11:32:14 +02:00
parent 87b0561c88
commit a124c9a580
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fftools/ffprobe.c
View File

@ -3074,7 +3074,7 @@ int main(int argc, char **argv)
AVTextWriterContext *wctx; AVTextWriterContext *wctx;
char *buf; char *buf;
char *f_name = NULL, *f_args = NULL; char *f_name = NULL, *f_args = NULL;
int ret, i; int ret, input_ret, i;
init_dynload(); init_dynload();
@ -3201,11 +3201,19 @@ int main(int argc, char **argv)
show_error(tctx, ret); show_error(tctx, ret);
} }
input_ret = ret;
avtext_print_section_footer(tctx); avtext_print_section_footer(tctx);
avtextwriter_context_close(&wctx); ret = avtextwriter_context_close(&wctx);
if (ret < 0)
av_log(NULL, AV_LOG_ERROR, "Writing output failed (closing writer): %s\n", av_err2str(ret));
avtext_context_close(&tctx); ret = avtext_context_close(&tctx);
if (ret < 0)
av_log(NULL, AV_LOG_ERROR, "Writing output failed (closing formatter): %s\n", av_err2str(ret));
ret = FFMIN(ret, input_ret);
} }
end: end:

12
fftools/textformat/avtextformat.c
View File

@ -98,13 +98,14 @@ static void bprint_bytes(AVBPrint *bp, const uint8_t *ubuf, size_t ubuf_size)
av_bprintf(bp, "%02X", ubuf[i]); av_bprintf(bp, "%02X", ubuf[i]);
} }
void avtext_context_close(AVTextFormatContext **ptctx) int avtext_context_close(AVTextFormatContext **ptctx)
{ {
AVTextFormatContext *tctx = *ptctx; AVTextFormatContext *tctx = *ptctx;
int i; int i;
int ret = 0;
if (!tctx) if (!tctx)
return; return AVERROR(EINVAL);
av_hash_freep(&tctx->hash); av_hash_freep(&tctx->hash);
@ -121,6 +122,7 @@ void avtext_context_close(AVTextFormatContext **ptctx)
av_freep(&tctx->priv); av_freep(&tctx->priv);
av_opt_free(tctx); av_opt_free(tctx);
av_freep(ptctx); av_freep(ptctx);
return ret;
} }
@ -615,12 +617,13 @@ static const AVClass textwriter_class = {
}; };
void avtextwriter_context_close(AVTextWriterContext **pwctx) int avtextwriter_context_close(AVTextWriterContext **pwctx)
{ {
AVTextWriterContext *wctx = *pwctx; AVTextWriterContext *wctx = *pwctx;
int ret = 0;
if (!wctx) if (!wctx)
return; return AVERROR(EINVAL);
if (wctx->writer) { if (wctx->writer) {
if (wctx->writer->uninit) if (wctx->writer->uninit)
@ -630,6 +633,7 @@ void avtextwriter_context_close(AVTextWriterContext **pwctx)
} }
av_freep(&wctx->priv); av_freep(&wctx->priv);
av_freep(pwctx); av_freep(pwctx);
return ret;
} }

2
fftools/textformat/avtextformat.h
View File

@ -158,7 +158,7 @@ typedef struct AVTextFormatOptions {
int avtext_context_open(AVTextFormatContext **ptctx, const AVTextFormatter *formatter, AVTextWriterContext *writer_context, const char *args, int avtext_context_open(AVTextFormatContext **ptctx, const AVTextFormatter *formatter, AVTextWriterContext *writer_context, const char *args,
const AVTextFormatSection *sections, int nb_sections, AVTextFormatOptions options, char *show_data_hash); const AVTextFormatSection *sections, int nb_sections, AVTextFormatOptions options, char *show_data_hash);
void avtext_context_close(AVTextFormatContext **tctx); int avtext_context_close(AVTextFormatContext **tctx);
void avtext_print_section_header(AVTextFormatContext *tctx, const void *data, int section_id); void avtext_print_section_header(AVTextFormatContext *tctx, const void *data, int section_id);

2
fftools/textformat/avtextwriters.h
View File

@ -49,7 +49,7 @@ typedef struct AVTextWriterContext {
int avtextwriter_context_open(AVTextWriterContext **pwctx, const AVTextWriter *writer); int avtextwriter_context_open(AVTextWriterContext **pwctx, const AVTextWriter *writer);
void avtextwriter_context_close(AVTextWriterContext **pwctx); int avtextwriter_context_close(AVTextWriterContext **pwctx);
int avtextwriter_create_stdout(AVTextWriterContext **pwctx); int avtextwriter_create_stdout(AVTextWriterContext **pwctx);