summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-12-23 22:15:32 +0000
committerjstebbins <[email protected]>2014-12-23 22:15:32 +0000
commite63bbc51fc335708b639d9709019b482ba117e37 (patch)
treed45f8b95208fbe244be7cfe2fee5e001d2ed9f4a
parent2f8e8b63af1a896d4d15b48ee46a09ca1e061583 (diff)
libhb: eliminate unnecessary references to mp4v2
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6648 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--libhb/common.c5
-rw-r--r--libhb/work.c3
2 files changed, 1 insertions, 7 deletions
diff --git a/libhb/common.c b/libhb/common.c
index 357405c6b..77be3bb96 100644
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -3793,11 +3793,6 @@ int hb_subtitle_can_pass( int source, int mux )
return 0;
} break;
- case HB_MUX_MP4V2:
- if (source == VOBSUB)
- {
- return 1;
- } // fall through to next case...
case HB_MUX_AV_MP4:
switch( source )
{
diff --git a/libhb/work.c b/libhb/work.c
index 4825a1db4..72d4d294a 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -360,8 +360,7 @@ void hb_display_job_info(hb_job_t *job)
}
}
- if (job->color_matrix_code && (job->vcodec == HB_VCODEC_X264 ||
- job->mux == HB_MUX_MP4V2))
+ if (job->color_matrix_code && job->vcodec == HB_VCODEC_X264)
{
// color matrix is set:
// 1) at the stream level (x264 only),