summaryrefslogtreecommitdiff
authorke.gong <ke.gong@amlogic.com>2012-08-09 06:10:47 (GMT)
committer ke.gong <ke.gong@amlogic.com>2012-08-09 06:10:47 (GMT)
commitdaed3ec8a6595e030ab81f42ebc73f1ccb08c936 (patch)
treee3f9eed0d7b2f345ff3962f8efbcd8426efb0bcf
parentf811677bd9b41a39239ed46b7eb336e34296e5fa (diff)
downloadlibzvbi-daed3ec8a6595e030ab81f42ebc73f1ccb08c936.zip
libzvbi-daed3ec8a6595e030ab81f42ebc73f1ccb08c936.tar.gz
libzvbi-daed3ec8a6595e030ab81f42ebc73f1ccb08c936.tar.bz2
Revert "fixed some subtitle teletext page do not store bug"
This reverts commit f811677bd9b41a39239ed46b7eb336e34296e5fa.
Diffstat
-rw-r--r--Android.mk4
-rw-r--r--src/packet.c8
2 files changed, 5 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk
index 0a928c1..af64a31 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,11 +13,11 @@ LOCAL_CFLAGS+=-D_REENTRANT -D_GNU_SOURCE -DENABLE_DVB=1 -DENABLE_V4L=1 -DENABLE_
LOCAL_ARM_MODE := arm
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../dvb/android/ex_include
-LOCAL_SHARED_LIBRARIES += liblog
+LOCAL_SHARED_LIBRARIES +=
LOCAL_STATIC_LIBRARIES += libiconv
LOCAL_PRELINK_MODULE := false
include $(BUILD_SHARED_LIBRARY)
-#include $(LOCAL_PATH)/../dvb/android/ex_lib/Android.mk
+include $(LOCAL_PATH)/../dvb/android/ex_lib/Android.mk
diff --git a/src/packet.c b/src/packet.c
index 79aa261..c456e35 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -2075,16 +2075,14 @@ vbi_decode_teletext(vbi_decoder *vbi, uint8_t *p)
curr = rvtp;
vtp = curr->page;
- //Fixed by GK
- /*if ((vtp->pgno & 0xFF) == page)
- break;*/
+ if ((vtp->pgno & 0xFF) == page)
+ break;
}
switch (vtp->function) {
case PAGE_FUNCTION_DISCARD:
case PAGE_FUNCTION_EPG:
- //Fixed by GK
- //break;
+ break;
case PAGE_FUNCTION_LOP:
if (!store_lop(vbi, vtp))