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

ffprobe: drop pointless opaque parameter in writer init callback

Browse Source 
The parameter was never used.
release/1.0
Stefano Sabatini 12 years ago
parent 58e9025993
commit 2089f93300
1 changed files with 9 additions and 10 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. 19
      ffprobe.c

19
ffprobe.c
Unescape View File

@ -160,7 +160,7 @@ typedef struct Writer {
int priv_size; ///< private size for the writer context int priv_size; ///< private size for the writer context
const char *name; const char *name;
int (*init) (WriterContext *wctx, const char *args, void *opaque); int (*init) (WriterContext *wctx, const char *args);
void (*uninit)(WriterContext *wctx); void (*uninit)(WriterContext *wctx);
void (*print_header)(WriterContext *ctx); void (*print_header)(WriterContext *ctx);
@ -220,8 +220,7 @@ static void writer_close(WriterContext **wctx)
av_freep(wctx); av_freep(wctx);
} }
static int writer_open(WriterContext **wctx, const Writer *writer, static int writer_open(WriterContext **wctx, const Writer *writer, const char *args)
const char *args, void *opaque)
{ {
int ret = 0; int ret = 0;
@ -248,7 +247,7 @@ static int writer_open(WriterContext **wctx, const Writer *writer,
goto fail; goto fail;
} }
if ((*wctx)->writer->init) if ((*wctx)->writer->init)
ret = (*wctx)->writer->init(*wctx, args, opaque); ret = (*wctx)->writer->init(*wctx, args);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
@ -612,7 +611,7 @@ static const AVOption compact_options[]= {
DEFINE_WRITER_CLASS(compact); DEFINE_WRITER_CLASS(compact);
static av_cold int compact_init(WriterContext *wctx, const char *args, void *opaque) static av_cold int compact_init(WriterContext *wctx, const char *args)
{ {
CompactContext *compact = wctx->priv; CompactContext *compact = wctx->priv;
@ -757,7 +756,7 @@ static const AVOption flat_options[]= {
DEFINE_WRITER_CLASS(flat); DEFINE_WRITER_CLASS(flat);
static av_cold int flat_init(WriterContext *wctx, const char *args, void *opaque) static av_cold int flat_init(WriterContext *wctx, const char *args)
{ {
FlatContext *flat = wctx->priv; FlatContext *flat = wctx->priv;
@ -896,7 +895,7 @@ static const AVOption ini_options[] = {
DEFINE_WRITER_CLASS(ini); DEFINE_WRITER_CLASS(ini);
static av_cold int ini_init(WriterContext *wctx, const char *args, void *opaque) static av_cold int ini_init(WriterContext *wctx, const char *args)
{ {
INIContext *ini = wctx->priv; INIContext *ini = wctx->priv;
@ -1040,7 +1039,7 @@ static const AVOption json_options[]= {
DEFINE_WRITER_CLASS(json); DEFINE_WRITER_CLASS(json);
static av_cold int json_init(WriterContext *wctx, const char *args, void *opaque) static av_cold int json_init(WriterContext *wctx, const char *args)
{ {
JSONContext *json = wctx->priv; JSONContext *json = wctx->priv;
@ -1247,7 +1246,7 @@ static const AVOption xml_options[] = {
DEFINE_WRITER_CLASS(xml); DEFINE_WRITER_CLASS(xml);
static av_cold int xml_init(WriterContext *wctx, const char *args, void *opaque) static av_cold int xml_init(WriterContext *wctx, const char *args)
{ {
XMLContext *xml = wctx->priv; XMLContext *xml = wctx->priv;
@ -2112,7 +2111,7 @@ int main(int argc, char **argv)
goto end; goto end;
} }
if ((ret = writer_open(&wctx, w, w_args, NULL)) >= 0) { if ((ret = writer_open(&wctx, w, w_args)) >= 0) {
writer_print_header(wctx); writer_print_header(wctx);
if (do_show_program_version) if (do_show_program_version)

Write Preview
Loading…
Cancel
Save