diff options
| author | Rodeo <[email protected]> | 2014-02-12 01:24:30 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2014-02-12 01:24:30 +0000 |
| commit | 9c5ab59e9911f8efd7f414512f83056eb737be99 (patch) | |
| tree | 6c4ac6459daf410107855c1b06621a4af5464218 /libhb | |
| parent | 307c777504c7d3d2fc33db9bcaa3ef3d310e4d38 (diff) | |
x265: misc. container-related fixes.
CLI users: please use -f x265 instead of -f raw
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6027 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/common.c | 8 | ||||
| -rw-r--r-- | libhb/common.h | 4 | ||||
| -rw-r--r-- | libhb/muxcommon.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libhb/common.c b/libhb/common.c index aba04669b..141374fc7 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -57,7 +57,7 @@ enum HB_GID_ACODEC_VORBIS, HB_GID_MUX_MKV, HB_GID_MUX_MP4, - HB_GID_MUX_RAW, + HB_GID_MUX_265, }; typedef struct @@ -207,7 +207,7 @@ hb_encoder_internal_t hb_video_encoders[] = // actual encoders { { "H.264 (x264)", "x264", HB_VCODEC_X264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, }, { { "H.264 (Intel QSV)", "qsv_h264", HB_VCODEC_QSV_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, }, - { { "H.265 (x265)", "x265", HB_VCODEC_X265, HB_MUX_RAW, }, NULL, 1, HB_GID_VCODEC_H265, }, + { { "H.265 (x265)", "x265", HB_VCODEC_X265, HB_MUX_X265, }, NULL, 1, HB_GID_VCODEC_H265, }, { { "MPEG-4", "mpeg4", HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_MPEG4, }, { { "MPEG-2", "mpeg2", HB_VCODEC_FFMPEG_MPEG2, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_MPEG2, }, { { "Theora", "theora", HB_VCODEC_THEORA, HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_THEORA, }, @@ -333,7 +333,7 @@ hb_container_internal_t hb_containers[] = { { "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, }, - { { "Raw", "raw", "raw", HB_MUX_RAW, }, NULL, 1, HB_GID_MUX_RAW, }, + { { "Raw H.265 (x265)", "x265", "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) @@ -351,7 +351,7 @@ static int hb_container_is_enabled(int format) case HB_MUX_AV_MKV: #endif #ifdef USE_X265 - case HB_MUX_RAW: + case HB_MUX_X265: #endif return 1; diff --git a/libhb/common.h b/libhb/common.h index db9440f4b..a07734729 100644 --- a/libhb/common.h +++ b/libhb/common.h @@ -501,7 +501,7 @@ struct hb_job_s * mux: output file format * file: file path */ -#define HB_MUX_MASK 0xFF0000 +#define HB_MUX_MASK 0xFF0001 #define HB_MUX_MP4V2 0x010000 #define HB_MUX_AV_MP4 0x020000 #define HB_MUX_MASK_MP4 0x030000 @@ -509,7 +509,7 @@ struct hb_job_s #define HB_MUX_AV_MKV 0x200000 #define HB_MUX_MASK_MKV 0x300000 #define HB_MUX_MASK_AV 0x220000 -#define HB_MUX_RAW 0x001000 +#define HB_MUX_X265 0x000001 /* default muxer for each container */ #define HB_MUX_MP4 HB_MUX_AV_MP4 #define HB_MUX_MKV HB_MUX_AV_MKV diff --git a/libhb/muxcommon.c b/libhb/muxcommon.c index 4ac35d515..9023cb374 100644 --- a/libhb/muxcommon.c +++ b/libhb/muxcommon.c @@ -476,7 +476,7 @@ hb_work_object_t * hb_muxer_init( hb_job_t * job ) break; #endif #ifdef USE_X265 - case HB_MUX_RAW: + case HB_MUX_X265: break; #endif default: |