summaryrefslogtreecommitdiff
path: root/libavformat/asfenc.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2009-03-01 00:12:08 +0000
committerAurelien Jacobs <aurel@gnuage.org>2009-03-01 00:12:08 +0000
commit719e721a145680bec580f644788179435b43754a (patch)
tree35ee2a65509d2e760c22a7d126210cafdf7c75dc /libavformat/asfenc.c
parentf610a9f284e8319907962b1be4d93051444bcf90 (diff)
Add some basic metadata conversion tables for matroska and asf.
Add missing const qualifiers for metadata_conv in AV{In|Out}putFormat. Originally committed as revision 17671 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/asfenc.c')
-rw-r--r--libavformat/asfenc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index f9dfa97c5b..8c5aec738f 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -855,6 +855,7 @@ AVOutputFormat asf_muxer = {
asf_write_trailer,
.flags = AVFMT_GLOBALHEADER,
.codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0},
+ .metadata_conv = ff_asf_metadata_conv,
};
#endif
@@ -876,5 +877,6 @@ AVOutputFormat asf_stream_muxer = {
asf_write_trailer,
.flags = AVFMT_GLOBALHEADER,
.codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0},
+ .metadata_conv = ff_asf_metadata_conv,
};
#endif //CONFIG_ASF_STREAM_MUXER