X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frpl.c;h=1e2f65f770b8327e94c9d57369dbb210f08d3350;hb=2a44a8f6091913bad14c4df318ceeb68dc4a9258;hp=935b81d7d8b19b15fde7de59264af21fe5d1d889;hpb=e65ab9d94f1c8d8893e32d90467d9525625d306a;p=ffmpeg diff --git a/libavformat/rpl.c b/libavformat/rpl.c index 935b81d7d8b..1e2f65f770b 100644 --- a/libavformat/rpl.c +++ b/libavformat/rpl.c @@ -20,6 +20,7 @@ */ #include "libavutil/avstring.h" +#include "libavutil/dict.h" #include "avformat.h" #include @@ -131,11 +132,11 @@ static int rpl_read_header(AVFormatContext *s, AVFormatParameters *ap) // for the text in a few cases; samples needed.) error |= read_line(pb, line, sizeof(line)); // ARMovie error |= read_line(pb, line, sizeof(line)); // movie name - av_metadata_set2(&s->metadata, "title" , line, 0); + av_dict_set(&s->metadata, "title" , line, 0); error |= read_line(pb, line, sizeof(line)); // date/copyright - av_metadata_set2(&s->metadata, "copyright", line, 0); + av_dict_set(&s->metadata, "copyright", line, 0); error |= read_line(pb, line, sizeof(line)); // author and other - av_metadata_set2(&s->metadata, "author" , line, 0); + av_dict_set(&s->metadata, "author" , line, 0); // video headers vst = av_new_stream(s, 0); @@ -350,10 +351,10 @@ static int rpl_read_packet(AVFormatContext *s, AVPacket *pkt) } AVInputFormat ff_rpl_demuxer = { - "rpl", - NULL_IF_CONFIG_SMALL("RPL/ARMovie format"), - sizeof(RPLContext), - rpl_probe, - rpl_read_header, - rpl_read_packet, + .name = "rpl", + .long_name = NULL_IF_CONFIG_SMALL("RPL/ARMovie format"), + .priv_data_size = sizeof(RPLContext), + .read_probe = rpl_probe, + .read_header = rpl_read_header, + .read_packet = rpl_read_packet, };