@@ -46,6 +46,9 @@ static const AVOption options[] = {

     { "movflags", "MOV muxer flags", offsetof(MOVMuxContext, flags), AV_OPT_TYPE_FLAGS, {.dbl = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

     { "rtphint", "Add RTP hint tracks", 0, AV_OPT_TYPE_CONST, {.dbl = FF_MOV_FLAG_RTP_HINT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },

     FF_RTP_FLAG_OPTS(MOVMuxContext, rtp_flags),

+    { "skip_iods", "Skip writing iods atom.", offsetof(MOVMuxContext, iods_skip), AV_OPT_TYPE_INT, {.dbl = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},

+    { "iods_audio_profile", "iods audio profile atom.", offsetof(MOVMuxContext, iods_audio_profile), AV_OPT_TYPE_INT, {.dbl = -1}, -1, 255, AV_OPT_FLAG_ENCODING_PARAM},

+    { "iods_video_profile", "iods video profile atom.", offsetof(MOVMuxContext, iods_video_profile), AV_OPT_TYPE_INT, {.dbl = -1}, -1, 255, AV_OPT_FLAG_ENCODING_PARAM},

     { NULL },

 };

@@ -1407,21 +1410,34 @@ static int mov_write_trak_tag(AVIOContext *pb, MOVTrack *track, AVStream *st)

     return updateSize(pb, pos);

 }

-#if 0

-/* TODO: Not sorted out, but not necessary either */

 static int mov_write_iods_tag(AVIOContext *pb, MOVMuxContext *mov)

 {

-    avio_wb32(pb, 0x15); /* size */

+    int i, has_audio = 0, has_video = 0;

+    int64_t pos = avio_tell(pb);

+    int audio_profile = mov->iods_audio_profile;

+    int video_profile = mov->iods_video_profile;

+    for (i = 0; i < mov->nb_streams; i++) {

+        if(mov->tracks[i].entry > 0) {

+            has_audio |= mov->tracks[i].enc->codec_type == AVMEDIA_TYPE_AUDIO;

+            has_video |= mov->tracks[i].enc->codec_type == AVMEDIA_TYPE_VIDEO;

+        }

+    }

+    if (audio_profile < 0)

+        audio_profile = 0xFF - has_audio;

+    if (video_profile < 0)

+        video_profile = 0xFF - has_video;

+    avio_wb32(pb, 0x0); /* size */

     ffio_wfourcc(pb, "iods");

     avio_wb32(pb, 0);    /* version & flags */

-    avio_wb16(pb, 0x1007);

-    avio_w8(pb, 0);

-    avio_wb16(pb, 0x4fff);

-    avio_wb16(pb, 0xfffe);

-    avio_wb16(pb, 0x01ff);

-    return 0x15;

+    putDescr(pb, 0x10, 7);

+    avio_wb16(pb, 0x004f);

+    avio_w8(pb, 0xff);

+    avio_w8(pb, 0xff);

+    avio_w8(pb, audio_profile);

+    avio_w8(pb, video_profile);

+    avio_w8(pb, 0xff);

+    return updateSize(pb, pos);

 }

-#endif

 static int mov_write_mvhd_tag(AVIOContext *pb, MOVMuxContext *mov)

 {

@@ -1829,7 +1845,8 @@ static int mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov,

     }

     mov_write_mvhd_tag(pb, mov);

-    //mov_write_iods_tag(pb, mov);

+    if (mov->mode != MODE_MOV && !mov->iods_skip)

+        mov_write_iods_tag(pb, mov);

     for (i=0; i<mov->nb_streams; i++) {

         if(mov->tracks[i].entry > 0) {

             mov_write_trak_tag(pb, &(mov->tracks[i]), i < s->nb_streams ? s->streams[i] : NULL);

@@ -112,6 +112,9 @@ typedef struct MOVMuxContext {

     int flags;

     int rtp_flags;

+    int iods_skip;

+    int iods_video_profile;

+    int iods_audio_profile;

 } MOVMuxContext;

 #define FF_MOV_FLAG_RTP_HINT 1

@@ -1,4 +1,4 @@

-b25bcc7ec3f5c19cdfc01a6bbd32edb8 *./tests/data/acodec/alac.m4a

-389386 ./tests/data/acodec/alac.m4a

+8d9cb7f65c5b17c74e5f9bdc36f32b7d *./tests/data/acodec/alac.m4a

+389410 ./tests/data/acodec/alac.m4a

 64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/alac.acodec.out.wav

 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400

@@ -1,4 +1,4 @@

-080e75117f8142001b096cd977ba287e *./tests/data/vsynth1/odivx.mp4

-540156 ./tests/data/vsynth1/odivx.mp4

+9251145d12150cb639098016d61fc75e *./tests/data/vsynth1/odivx.mp4

+540180 ./tests/data/vsynth1/odivx.mp4

 8828a375448dc5c2215163ba70656f89 *./tests/data/mpeg4.vsynth1.out.yuv

 stddev:    7.97 PSNR: 30.10 MAXDIFF:  105 bytes:  7603200/  7603200

@@ -1,4 +1,4 @@

-8ffbe8ce43fe126b12cf9621717d641b *./tests/data/vsynth2/odivx.mp4

-119809 ./tests/data/vsynth2/odivx.mp4

+c2ca709a0ed64833fd38f703b19e5e85 *./tests/data/vsynth2/odivx.mp4

+119833 ./tests/data/vsynth2/odivx.mp4

 90a3577850239083a9042bef33c50e85 *./tests/data/mpeg4.vsynth2.out.yuv

 stddev:    5.34 PSNR: 33.57 MAXDIFF:   83 bytes:  7603200/  7603200