diff options
| author | Rodeo <[email protected]> | 2013-11-08 23:09:51 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-11-08 23:09:51 +0000 |
| commit | c4477f468483470c8f531b19a7bda199122779fa (patch) | |
| tree | 43d76d91a5aab06a21897f185d5c403147532bdf | |
| parent | 2068e877b79fb5513704a6a0c12764e55e65af6e (diff) | |
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
| -rw-r--r-- | libhb/common.c | 4 | ||||
| -rw-r--r-- | libhb/common.h | 4 |
2 files changed, 4 insertions, 4 deletions
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) diff --git a/libhb/common.h b/libhb/common.h index b57103d06..a76e51e55 100644 --- 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; |