@@ -67,6 +67,7 @@ static const AVOption options[] = {

     { "ism_lookahead", "Number of lookahead entries for ISM files", offsetof(MOVMuxContext, ism_lookahead), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM},

     { "use_editlist", "use edit list", offsetof(MOVMuxContext, use_editlist), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM},

     { "video_track_timescale", "set timescale of all video tracks", offsetof(MOVMuxContext, video_track_timescale), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM},

+    { "brand",    "Override major brand", offsetof(MOVMuxContext, major_brand),   AV_OPT_TYPE_STRING, {.str = NULL}, .flags = AV_OPT_FLAG_ENCODING_PARAM },

     { NULL },

 };

@@ -2960,7 +2961,9 @@ static int mov_write_ftyp_tag(AVIOContext *pb, AVFormatContext *s)

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

     ffio_wfourcc(pb, "ftyp");

-    if (mov->mode == MODE_3GP) {

+    if (mov->major_brand && strlen(mov->major_brand) >= 4)

+        ffio_wfourcc(pb, mov->major_brand);

+    else if (mov->mode == MODE_3GP) {

         ffio_wfourcc(pb, has_h264 ? "3gp6"  : "3gp4");

         minor =     has_h264 ?   0x100 :   0x200;

     } else if (mov->mode & MODE_3G2) {

@@ -173,6 +173,8 @@ typedef struct MOVMuxContext {

     int reserved_moov_size; ///< 0 for disabled, -1 for automatic, size otherwise

     int64_t reserved_moov_pos;

+

+    char *major_brand;

 } MOVMuxContext;

 #define FF_MOV_FLAG_RTP_HINT 1