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
160 int priv_size; ///< private size for the writer context160 int priv_size; ///< private size for the writer context
161 const char *name;161 const char *name;
162 162
163 int (*init) (WriterContext *wctx, const char *args, void *opaque);163 int (*init) (WriterContext *wctx, const char *args);
164 void (*uninit)(WriterContext *wctx);164 void (*uninit)(WriterContext *wctx);
165 165
166 void (*print_header)(WriterContext *ctx);166 void (*print_header)(WriterContext *ctx);
@@ -220,8 +220,7 @@ static void writer_close(WriterContext **wctx) · 53 unmodified lines
220 av_freep(wctx);220 av_freep(wctx);
221}221}
222 222
223static int writer_open(WriterContext **wctx, const Writer *writer,223static int writer_open(WriterContext **wctx, const Writer *writer, const char *args)
224 const char *args, void *opaque)
225{224{
226 int ret = 0;225 int ret = 0;
227 226
@@ -248,7 +247,7 @@ static int writer_open(WriterContext **wctx, const Writer *writer, · 20 unmodified lines
248 goto fail;247 goto fail;
249 }248 }
250 if ((*wctx)->writer->init)249 if ((*wctx)->writer->init)
251 ret = (*wctx)->writer->init(*wctx, args, opaque);250 ret = (*wctx)->writer->init(*wctx, args);
252 if (ret < 0)251 if (ret < 0)
253 goto fail;252 goto fail;
254 253
@@ -612,7 +611,7 @@ static const AVOption compact_options[]= { · 357 unmodified lines
612 611
613DEFINE_WRITER_CLASS(compact);612DEFINE_WRITER_CLASS(compact);
614 613
615static av_cold int compact_init(WriterContext *wctx, const char *args, void *opaque)614static av_cold int compact_init(WriterContext *wctx, const char *args)
616{615{
617 CompactContext *compact = wctx->priv;616 CompactContext *compact = wctx->priv;
618 617
@@ -757,7 +756,7 @@ static const AVOption flat_options[]= { · 138 unmodified lines
757 756
758DEFINE_WRITER_CLASS(flat);757DEFINE_WRITER_CLASS(flat);
759 758
760static av_cold int flat_init(WriterContext *wctx, const char *args, void *opaque)759static av_cold int flat_init(WriterContext *wctx, const char *args)
761{760{
762 FlatContext *flat = wctx->priv;761 FlatContext *flat = wctx->priv;
763 762
@@ -896,7 +895,7 @@ static const AVOption ini_options[] = { · 132 unmodified lines
896 895
897DEFINE_WRITER_CLASS(ini);896DEFINE_WRITER_CLASS(ini);
898 897
899static av_cold int ini_init(WriterContext *wctx, const char *args, void *opaque)898static av_cold int ini_init(WriterContext *wctx, const char *args)
900{899{
901 INIContext *ini = wctx->priv;900 INIContext *ini = wctx->priv;
902 901
@@ -1040,7 +1039,7 @@ static const AVOption json_options[]= { · 137 unmodified lines
1040 1039
1041DEFINE_WRITER_CLASS(json);1040DEFINE_WRITER_CLASS(json);
1042 1041
1043static av_cold int json_init(WriterContext *wctx, const char *args, void *opaque)1042static av_cold int json_init(WriterContext *wctx, const char *args)
1044{1043{
1045 JSONContext *json = wctx->priv;1044 JSONContext *json = wctx->priv;
1046 1045
@@ -1247,7 +1246,7 @@ static const AVOption xml_options[] = { · 200 unmodified lines
1247 1246
1248DEFINE_WRITER_CLASS(xml);1247DEFINE_WRITER_CLASS(xml);
1249 1248
1250static av_cold int xml_init(WriterContext *wctx, const char *args, void *opaque)1249static av_cold int xml_init(WriterContext *wctx, const char *args)
1251{1250{
1252 XMLContext *xml = wctx->priv;1251 XMLContext *xml = wctx->priv;
1253 1252
@@ -2112,7 +2111,7 @@ int main(int argc, char **argv) · 858 unmodified lines
2112 goto end;2111 goto end;
2113 }2112 }
2114 2113
2115 if ((ret = writer_open(&wctx, w, w_args, NULL)) >= 0) {2114 if ((ret = writer_open(&wctx, w, w_args)) >= 0) {
2116 writer_print_header(wctx);2115 writer_print_header(wctx);
2117 2116
2118 if (do_show_program_version)2117 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