diff options
Diffstat (limited to 'lib/ffmpeg/libavformat/asfenc.c')
| -rw-r--r-- | lib/ffmpeg/libavformat/asfenc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/ffmpeg/libavformat/asfenc.c b/lib/ffmpeg/libavformat/asfenc.c index 9f8d69ac5c..b8f8635603 100644 --- a/lib/ffmpeg/libavformat/asfenc.c +++ b/lib/ffmpeg/libavformat/asfenc.c @@ -211,7 +211,7 @@ static void put_str16(ByteIOContext *s, const char *tag) if (url_open_dyn_buf(&dyn_buf) < 0) return; - ff_put_str16_nolen(dyn_buf, tag); + avio_put_str16le(dyn_buf, tag); len = url_close_dyn_buf(dyn_buf, &pb); put_le16(s, len); put_buffer(s, pb, len); @@ -279,6 +279,8 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data int bit_rate; int64_t duration; + ff_metadata_conv(&s->metadata, ff_asf_metadata_conv, NULL); + tags[0] = av_metadata_get(s->metadata, "title" , NULL, 0); tags[1] = av_metadata_get(s->metadata, "author" , NULL, 0); tags[2] = av_metadata_get(s->metadata, "copyright", NULL, 0); @@ -344,7 +346,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data hpos = put_header(pb, &ff_asf_comment_header); for (n = 0; n < FF_ARRAY_ELEMS(tags); n++) { - len = tags[n] ? ff_put_str16_nolen(dyn_buf, tags[n]->value) : 0; + len = tags[n] ? avio_put_str16le(dyn_buf, tags[n]->value) : 0; put_le16(pb, len); } len = url_close_dyn_buf(dyn_buf, &buf); @@ -472,7 +474,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data if ( url_open_dyn_buf(&dyn_buf) < 0) return AVERROR(ENOMEM); - ff_put_str16_nolen(dyn_buf, desc); + avio_put_str16le(dyn_buf, desc); len = url_close_dyn_buf(dyn_buf, &buf); put_le16(pb, len / 2); // "number of characters" = length in bytes / 2 @@ -853,7 +855,7 @@ static int asf_write_trailer(AVFormatContext *s) } #if CONFIG_ASF_MUXER -AVOutputFormat asf_muxer = { +AVOutputFormat ff_asf_muxer = { "asf", NULL_IF_CONFIG_SMALL("ASF format"), "video/x-ms-asf", @@ -870,12 +872,11 @@ AVOutputFormat asf_muxer = { asf_write_trailer, .flags = AVFMT_GLOBALHEADER, .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0}, - .metadata_conv = ff_asf_metadata_conv, }; #endif #if CONFIG_ASF_STREAM_MUXER -AVOutputFormat asf_stream_muxer = { +AVOutputFormat ff_asf_stream_muxer = { "asf_stream", NULL_IF_CONFIG_SMALL("ASF format"), "video/x-ms-asf", @@ -892,6 +893,5 @@ AVOutputFormat asf_stream_muxer = { asf_write_trailer, .flags = AVFMT_GLOBALHEADER, .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0}, - .metadata_conv = ff_asf_metadata_conv, }; #endif //CONFIG_ASF_STREAM_MUXER |