diff options
| author | Rodeo <[email protected]> | 2014-03-13 01:36:22 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2014-03-13 01:36:22 +0000 |
| commit | 042db50b62739c9a01ed83e225926dbe1de9b843 (patch) | |
| tree | 9fd5889fb7e16a564af87bd8447791a431aa2d32 /libhb/common.c | |
| parent | 74bc2e472c901e75412dd82845e6cc16277eff1d (diff) | |
x265: enable MP4 and Matroska muxing.
Also remove the raw muxer.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6105 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/common.c')
| -rw-r--r-- | libhb/common.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libhb/common.c b/libhb/common.c index 34bc5a047..8f206c69f 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -57,7 +57,6 @@ enum HB_GID_ACODEC_VORBIS, HB_GID_MUX_MKV, HB_GID_MUX_MP4, - HB_GID_MUX_265, }; typedef struct @@ -207,7 +206,7 @@ hb_encoder_internal_t hb_video_encoders[] = // actual encoders { { "H.264 (x264)", "x264", "H.264 (libx264)", HB_VCODEC_X264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, }, { { "H.264 (Intel QSV)", "qsv_h264", "H.264 (Intel Media SDK)", HB_VCODEC_QSV_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, }, - { { "H.265 (x265)", "x265", "H.265 (libx265)", HB_VCODEC_X265, HB_MUX_X265, }, NULL, 1, HB_GID_VCODEC_H265, }, + { { "H.265 (x265)", "x265", "H.265 (libx265)", HB_VCODEC_X265, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 1, HB_GID_VCODEC_H265, }, { { "MPEG-4", "mpeg4", "MPEG-4 (libavcodec)", HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_MPEG4, }, { { "MPEG-2", "mpeg2", "MPEG-2 (libavcodec)", HB_VCODEC_FFMPEG_MPEG2, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_MPEG2, }, { { "Theora", "theora", "Theora (libtheora)", HB_VCODEC_THEORA, HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_THEORA, }, @@ -331,7 +330,6 @@ hb_container_internal_t hb_containers[] = { { "MPEG-4 (mp4v2)", "mp4v2", "MPEG-4 (libmp4v2)", "mp4", HB_MUX_MP4V2, }, NULL, 1, HB_GID_MUX_MP4, }, { { "Matroska (avformat)", "av_mkv", "Matroska (libavformat)", "mkv", HB_MUX_AV_MKV, }, NULL, 1, HB_GID_MUX_MKV, }, { { "Matroska (libmkv)", "libmkv", "Matroska (libmkv)", "mkv", HB_MUX_LIBMKV, }, NULL, 1, HB_GID_MUX_MKV, }, - { { "Raw H.265 (x265)", "x265", "H.265 (raw stream)", "265", HB_MUX_X265, }, NULL, 1, HB_GID_MUX_265, }, }; int hb_containers_count = sizeof(hb_containers) / sizeof(hb_containers[0]); static int hb_container_is_enabled(int format) @@ -348,9 +346,6 @@ static int hb_container_is_enabled(int format) case HB_MUX_AV_MP4: case HB_MUX_AV_MKV: #endif -#ifdef USE_X265 - case HB_MUX_X265: -#endif return 1; default: |