History

ffprobe: drop pointless opaque parameter in writer init callback

The parameter was never used.

Stefano Sabatini committed 14 years ago

Commit 2089f931 parent 58e90251 file · +9 −10Browse files

Unified · Split

ffprobe.c+9−10
@@ -160,7 +160,7 @@ typedef struct Writer { · 159 unmodified lines
160160 int priv_size; ///< private size for the writer context
161161 const char *name;
162162
163− int (*init) (WriterContext *wctx, const char *args, void *opaque);
163+ int (*init) (WriterContext *wctx, const char *args);
164164 void (*uninit)(WriterContext *wctx);
165165
166166 void (*print_header)(WriterContext *ctx);
@@ -220,8 +220,7 @@ static void writer_close(WriterContext **wctx) · 53 unmodified lines
220220 av_freep(wctx);
221221 }
222222
223−static int writer_open(WriterContext **wctx, const Writer *writer,
224− const char *args, void *opaque)
223+static int writer_open(WriterContext **wctx, const Writer *writer, const char *args)
225224 {
226225 int ret = 0;
227226
@@ -248,7 +247,7 @@ static int writer_open(WriterContext **wctx, const Writer *writer, · 20 unmodified lines
248247 goto fail;
249248 }
250249 if ((*wctx)->writer->init)
251− ret = (*wctx)->writer->init(*wctx, args, opaque);
250+ ret = (*wctx)->writer->init(*wctx, args);
252251 if (ret < 0)
253252 goto fail;
254253
@@ -612,7 +611,7 @@ static const AVOption compact_options[]= { · 357 unmodified lines
612611
613612 DEFINE_WRITER_CLASS(compact);
614613
615−static av_cold int compact_init(WriterContext *wctx, const char *args, void *opaque)
614+static av_cold int compact_init(WriterContext *wctx, const char *args)
616615 {
617616 CompactContext *compact = wctx->priv;
618617
@@ -757,7 +756,7 @@ static const AVOption flat_options[]= { · 138 unmodified lines
757756
758757 DEFINE_WRITER_CLASS(flat);
759758
760−static av_cold int flat_init(WriterContext *wctx, const char *args, void *opaque)
759+static av_cold int flat_init(WriterContext *wctx, const char *args)
761760 {
762761 FlatContext *flat = wctx->priv;
763762
@@ -896,7 +895,7 @@ static const AVOption ini_options[] = { · 132 unmodified lines
896895
897896 DEFINE_WRITER_CLASS(ini);
898897
899−static av_cold int ini_init(WriterContext *wctx, const char *args, void *opaque)
898+static av_cold int ini_init(WriterContext *wctx, const char *args)
900899 {
901900 INIContext *ini = wctx->priv;
902901
@@ -1040,7 +1039,7 @@ static const AVOption json_options[]= { · 137 unmodified lines
10401039
10411040 DEFINE_WRITER_CLASS(json);
10421041
1043−static av_cold int json_init(WriterContext *wctx, const char *args, void *opaque)
1042+static av_cold int json_init(WriterContext *wctx, const char *args)
10441043 {
10451044 JSONContext *json = wctx->priv;
10461045
@@ -1247,7 +1246,7 @@ static const AVOption xml_options[] = { · 200 unmodified lines
12471246
12481247 DEFINE_WRITER_CLASS(xml);
12491248
1250−static av_cold int xml_init(WriterContext *wctx, const char *args, void *opaque)
1249+static av_cold int xml_init(WriterContext *wctx, const char *args)
12511250 {
12521251 XMLContext *xml = wctx->priv;
12531252
@@ -2112,7 +2111,7 @@ int main(int argc, char **argv) · 858 unmodified lines
21122111 goto end;
21132112 }
21142113
2115− if ((ret = writer_open(&wctx, w, w_args, NULL)) >= 0) {
2114+ if ((ret = writer_open(&wctx, w, w_args)) >= 0) {
21162115 writer_print_header(wctx);
21172116
21182117 if (do_show_program_version)

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