diff options
| author | jstebbins <[email protected]> | 2010-08-24 18:22:58 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-08-24 18:22:58 +0000 |
| commit | 1eaa78b3d8309d912bca7d24388faa4bb6bd26a0 (patch) | |
| tree | ee60b3fa506d816beae7d1a5193ba7df7c8b149b /gtk | |
| parent | 08de2cf8a50bcfe3c6eafe73a8c1bbb64f97b567 (diff) | |
Allow trellis and psy-trellis with cavlc in preparation for next
x264 bump.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3491 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/src/makedeps.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gtk/src/makedeps.py b/gtk/src/makedeps.py index 751475031..986cf5b52 100644 --- a/gtk/src/makedeps.py +++ b/gtk/src/makedeps.py @@ -57,10 +57,8 @@ dep_map = ( DepEntry("x264_bframes", "x264_bpyramid", "<2", True, False), DepEntry("x264_bframes", "x264_direct", "0", True, False), DepEntry("x264_bframes", "x264_b_adapt", "0", True, False), - DepEntry("x264_cabac", "x264_trellis", "TRUE", False, False), DepEntry("x264_subme", "x264_psy_rd", "<6", True, False), DepEntry("x264_subme", "x264_psy_trell", "<6", True, False), - DepEntry("x264_cabac", "x264_psy_trell", "TRUE", False, False), DepEntry("x264_trellis", "x264_psy_trell", "0", True, False), DepEntry("ChapterMarkers", "chapters_list", "TRUE", False, False), DepEntry("use_source_name", "chapters_in_destination", "TRUE", False, False), |