[x265] [PATCH 2 of 2] fix bug when '--no-wpp --no-lft'

[Min Chen]

# HG changeset patch
# User Min Chen <chenm003 at 163.com>
# Date 1375886170 -28800
# Node ID ba99c00c9815425b48c38519e75d98915cf6a76d
# Parent  aaf462d34259f3e95a931ca2483e0abf02b53ce4
fix bug when '--no-wpp --no-lft'

diff -r aaf462d34259 -r ba99c00c9815 source/Lib/TLibEncoder/TEncCavlc.cpp
--- a/source/Lib/TLibEncoder/TEncCavlc.cpp	Wed Aug 07 22:35:47 2013 +0800
+++ b/source/Lib/TLibEncoder/TEncCavlc.cpp	Wed Aug 07 22:36:10 2013 +0800
@@ -191,6 +191,7 @@
     WRITE_FLAG(0,                                                 "tiles_enabled_flag");
     WRITE_FLAG(pcPPS->getEntropyCodingSyncEnabledFlag() ? 1 : 0, "entropy_coding_sync_enabled_flag");
     WRITE_FLAG(1,                                                            "loop_filter_across_slices_enabled_flag");
+    // TODO: Here have some time sequence problem, we set below field in initEncSlice(), but use them in getStreamHeaders() early
     WRITE_FLAG(pcPPS->getDeblockingFilterControlPresentFlag() ? 1 : 0,       "deblocking_filter_control_present_flag");
     if (pcPPS->getDeblockingFilterControlPresentFlag())
     {
diff -r aaf462d34259 -r ba99c00c9815 source/Lib/TLibEncoder/TEncTop.cpp
--- a/source/Lib/TLibEncoder/TEncTop.cpp	Wed Aug 07 22:35:47 2013 +0800
+++ b/source/Lib/TLibEncoder/TEncTop.cpp	Wed Aug 07 22:36:10 2013 +0800
@@ -449,6 +449,8 @@
     pcPPS->setOutputFlagPresentFlag(false);
     pcPPS->setSignHideFlag(param.bEnableSignHiding);
     pcPPS->setDeblockingFilterControlPresentFlag(!param.bEnableLoopFilter);
+    pcPPS->setDeblockingFilterOverrideEnabledFlag(!m_loopFilterOffsetInPPS);
+    pcPPS->setPicDisableDeblockingFilterFlag(!param.bEnableLoopFilter);
     pcPPS->setLog2ParallelMergeLevelMinus2(m_log2ParallelMergeLevelMinus2);
     pcPPS->setCabacInitPresentFlag(CABAC_INIT_PRESENT_FLAG);
     Int histogram[MAX_NUM_REF + 1];