Commit 37d97840 authored by Hendrik Leppkes's avatar Hendrik Leppkes Committed by Michael Niedermayer

md5enc: don't reuse priv_class in two formats

Apparently, this is not allowed and can trip up all sorts of things.
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7d1d5968
...@@ -58,7 +58,7 @@ static const AVOption hash_options[] = { ...@@ -58,7 +58,7 @@ static const AVOption hash_options[] = {
{ NULL }, { NULL },
}; };
static const AVClass hashenc_class = { static const AVClass md5enc_class = {
.class_name = "hash encoder class", .class_name = "hash encoder class",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = hash_options, .option = hash_options,
...@@ -106,7 +106,7 @@ AVOutputFormat ff_md5_muxer = { ...@@ -106,7 +106,7 @@ AVOutputFormat ff_md5_muxer = {
.write_packet = write_packet, .write_packet = write_packet,
.write_trailer = write_trailer, .write_trailer = write_trailer,
.flags = AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
.priv_class = &hashenc_class, .priv_class = &md5enc_class,
}; };
#endif #endif
...@@ -140,6 +140,13 @@ static int framemd5_write_trailer(struct AVFormatContext *s) ...@@ -140,6 +140,13 @@ static int framemd5_write_trailer(struct AVFormatContext *s)
return 0; return 0;
} }
static const AVClass framemd5_class = {
.class_name = "hash encoder class",
.item_name = av_default_item_name,
.option = hash_options,
.version = LIBAVUTIL_VERSION_INT,
};
AVOutputFormat ff_framemd5_muxer = { AVOutputFormat ff_framemd5_muxer = {
.name = "framemd5", .name = "framemd5",
.long_name = NULL_IF_CONFIG_SMALL("Per-frame MD5 testing"), .long_name = NULL_IF_CONFIG_SMALL("Per-frame MD5 testing"),
...@@ -151,6 +158,6 @@ AVOutputFormat ff_framemd5_muxer = { ...@@ -151,6 +158,6 @@ AVOutputFormat ff_framemd5_muxer = {
.write_trailer = framemd5_write_trailer, .write_trailer = framemd5_write_trailer,
.flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT | .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
AVFMT_TS_NEGATIVE, AVFMT_TS_NEGATIVE,
.priv_class = &hashenc_class, .priv_class = &framemd5_class,
}; };
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment