summaryrefslogtreecommitdiff
path: root/libavformat/avidec.c
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2010-10-15 19:04:25 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-10-15 19:04:25 +0000
commit03700d399bcc749ad7916f2d39a99527f37c8b6e (patch)
tree20d22335ebef2e37679f6e3c71d1e264c1e38fe5 /libavformat/avidec.c
parented09233fa2b081e3f60c02267fe9d17e0bb45396 (diff)
Export metadata in the generic format. Deprecate old conversion API.
patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avidec.c')
-rw-r--r--libavformat/avidec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 84ccaec5e3..2d38191726 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -693,6 +693,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
clean_index(s);
}
+ ff_metadata_conv_ctx(s, NULL, ff_avi_metadata_conv);
+
return 0;
}
@@ -1332,5 +1334,4 @@ AVInputFormat avi_demuxer = {
avi_read_packet,
avi_read_close,
avi_read_seek,
- .metadata_conv = ff_avi_metadata_conv,
};