In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it

[ffmpeg] / libavformat / nutenc.c

diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 8cbc7d4cc320b982608dbb67c28fd9667376d0e9..288e4bd4d834e3af7498bdd71fe510a2f5af2165 100644 (file)
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -491,6 +491,8 @@ static int write_headers(AVFormatContext *avctx, ByteIOContext *bc){
     ByteIOContext *dyn_bc;
     int i, ret;
 
+    ff_metadata_conv_ctx(avctx, ff_nut_metadata_conv, NULL);
+
     ret = url_open_dyn_buf(&dyn_bc);
     if(ret < 0)
         return ret;
@@ -791,7 +793,7 @@ static int write_trailer(AVFormatContext *s){
     return 0;
 }
 
-AVOutputFormat nut_muxer = {
+AVOutputFormat ff_nut_muxer = {
     "nut",
     NULL_IF_CONFIG_SMALL("NUT format"),
     "video/x-nut",
@@ -810,5 +812,4 @@ AVOutputFormat nut_muxer = {
     write_trailer,
     .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
     .codec_tag = (const AVCodecTag * const []){ ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 },
-    .metadata_conv = ff_nut_metadata_conv,
 };