libhb: make avformat-based muxers the default.

They've matured enough by now.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5890 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/common.c b/libhb/common.c
index 1b996e04aaf4930afa539a529de31072d8c01a00..720770a5de3baab60ac272318e6049d2a8e1d1d0 100644 (file)
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -319,10 +319,10 @@ hb_container_internal_t hb_containers[]  =
     { { "MP4 file",            "mp4",    "mp4",             0, }, NULL, 0, HB_GID_MUX_MP4, },
     { { "MKV file",            "mkv",    "mkv",             0, }, NULL, 0, HB_GID_MUX_MKV, },
     // actual muxers
-    { { "MPEG-4 (mp4v2)",      "mp4v2",  "mp4", HB_MUX_MP4V2,  }, NULL, 1, HB_GID_MUX_MP4, },
-    { { "Matroska (libmkv)",   "libmkv", "mkv", HB_MUX_LIBMKV, }, NULL, 1, HB_GID_MUX_MKV, },
     { { "MPEG-4 (avformat)",   "av_mp4", "mp4", HB_MUX_AV_MP4, }, NULL, 1, HB_GID_MUX_MP4, },
+    { { "MPEG-4 (mp4v2)",      "mp4v2",  "mp4", HB_MUX_MP4V2,  }, NULL, 1, HB_GID_MUX_MP4, },
     { { "Matroska (avformat)", "av_mkv", "mkv", HB_MUX_AV_MKV, }, NULL, 1, HB_GID_MUX_MKV, },
+    { { "Matroska (libmkv)",   "libmkv", "mkv", HB_MUX_LIBMKV, }, NULL, 1, HB_GID_MUX_MKV, },
 };
 int hb_containers_count = sizeof(hb_containers) / sizeof(hb_containers[0]);
 static int hb_container_is_enabled(int format)

diff --git a/libhb/common.h b/libhb/common.h
index b57103d06aceebc218c4e85cf8c2b15bef96524c..a76e51e55e45f96ec2c49dd4c53dd304f2d899a3 100644 (file)
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -507,8 +507,8 @@ struct hb_job_s
 #define HB_MUX_MASK_MKV 0x300000
 #define HB_MUX_MASK_AV  0x220000
 /* default muxer for each container */
-#define HB_MUX_MP4      HB_MUX_MP4V2
-#define HB_MUX_MKV      HB_MUX_LIBMKV
+#define HB_MUX_MP4      HB_MUX_AV_MP4
+#define HB_MUX_MKV      HB_MUX_AV_MKV
 
     int             mux;
     char          * file;