From c4477f468483470c8f531b19a7bda199122779fa Mon Sep 17 00:00:00 2001 From: Rodeo Date: Fri, 8 Nov 2013 23:09:51 +0000 Subject: 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 --- libhb/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libhb/common.c') diff --git a/libhb/common.c b/libhb/common.c index 1b996e04a..720770a5d 100644 --- 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) -- cgit v1.2.3