summaryrefslogtreecommitdiff
authorwei wang <wei.wang@amlogic.com>2019-04-10 06:45:31 (GMT)
committer wei wang <wei.wang@amlogic.com>2019-04-10 06:45:31 (GMT)
commitac7c22f497b891d887fedae7479955a4a2873539 (patch)
tree0ad4f007b62fe523048170acc08f6bdcec5a1748
parentb8403c4c3da4f6a01b5de1a834f7d00e3cd27bd7 (diff)
downloadmedia_modules-q-amlogic.zip
media_modules-q-amlogic.tar.gz
media_modules-q-amlogic.tar.bz2
decoder: fix a compile error [1/1]
PD#SWPL-6932 Problem: compile failed in decoder: assignment makes integer from pointer without a cast Solution: add type conversion Verify: Verify it on Franklin Change-Id: I46fa34c182f70ff82e5a79b804b932c397091984
Diffstat
-rw-r--r--drivers/frame_provider/decoder/h264_multi/vmh264.c2
-rw-r--r--drivers/frame_provider/decoder/mpeg12/vmpeg12.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/frame_provider/decoder/h264_multi/vmh264.c b/drivers/frame_provider/decoder/h264_multi/vmh264.c
index b7ab3b7..d8472fb 100644
--- a/drivers/frame_provider/decoder/h264_multi/vmh264.c
+++ b/drivers/frame_provider/decoder/h264_multi/vmh264.c
@@ -6561,7 +6561,7 @@ static int vmh264_user_data_read(struct vdec_s *vdec,
hw = (struct vdec_h264_hw_s *)vdec->private;
- addr = puserdata_para->pbuf_addr;
+ addr = (unsigned long)puserdata_para->pbuf_addr;
pdest_buf = (void *)addr;
mutex_lock(&hw->userdata_mutex);
diff --git a/drivers/frame_provider/decoder/mpeg12/vmpeg12.c b/drivers/frame_provider/decoder/mpeg12/vmpeg12.c
index f758076..6421094 100644
--- a/drivers/frame_provider/decoder/mpeg12/vmpeg12.c
+++ b/drivers/frame_provider/decoder/mpeg12/vmpeg12.c
@@ -1494,7 +1494,7 @@ static int vmpeg12_user_data_read(struct vdec_s *vdec,
u32 res;
int copy_ok = 1;
- addr = puserdata_para->pbuf_addr;
+ addr = (unsigned long)puserdata_para->pbuf_addr;
pdest_buf = (void *)addr;
mutex_lock(&userdata_mutex);