libhb: eliminate unnecessary references to mp4v2

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6648 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/common.c b/libhb/common.c
index 357405c6b656682a8288f335e1242f790dc0cd69..77be3bb967bf53bd519dafb604fbcd4a3c028aae 100644 (file)
--- 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 4825a1db486a9f1076000b73b2233329a71b937e..72d4d294a6aec3f6c4696b41c00edfef7105d437 100644 (file)
--- 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),