diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-05-22 12:46:29 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-06-08 07:43:45 +0200 |
| commit | d2d67e424fa10d883e13709095c80bd3b502ce03 (patch) | |
| tree | 3ff3180c011e728fbda17dd40e200c0f4946eb07 /libavformat/ffmetadec.c | |
| parent | d9f80ea2a7325f9c84307568843512811a99baff (diff) | |
| download | ffmpeg-d2d67e424fa10d883e13709095c80bd3b502ce03.tar.gz | |
Remove all uses of now deprecated metadata functions.
Diffstat (limited to 'libavformat/ffmetadec.c')
| -rw-r--r-- | libavformat/ffmetadec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c index 6915b60552..e3d800d3c4 100644 --- a/libavformat/ffmetadec.c +++ b/libavformat/ffmetadec.c @@ -22,6 +22,7 @@ #include "avformat.h" #include "ffmeta.h" #include "internal.h" +#include "libavutil/dict.h" static int probe(AVProbeData *p) { @@ -93,7 +94,7 @@ static uint8_t *unescape(uint8_t *buf, int size) return ret; } -static int read_tag(uint8_t *line, AVMetadata **m) +static int read_tag(uint8_t *line, AVDictionary **m) { uint8_t *key, *value, *p = line; @@ -117,13 +118,13 @@ static int read_tag(uint8_t *line, AVMetadata **m) return AVERROR(ENOMEM); } - av_metadata_set2(m, key, value, AV_METADATA_DONT_STRDUP_KEY | AV_METADATA_DONT_STRDUP_VAL); + av_dict_set(m, key, value, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL); return 0; } static int read_header(AVFormatContext *s, AVFormatParameters *ap) { - AVMetadata **m = &s->metadata; + AVDictionary **m = &s->metadata; uint8_t line[1024]; while(!s->pb->eof_reached) { |