Merge "h264: h264 dpb_print error. [1/1]" into amlogic-4.9-dev

author Hui Zhang <hui.zhang@amlogic.com>

Mon, 30 Sep 2019 02:16:04 +0000 (19:16 -0700)

committer Gerrit Code Review <gituser@scgit2.amlogic.com>

Mon, 30 Sep 2019 02:16:04 +0000 (19:16 -0700)
author Hui Zhang <hui.zhang@amlogic.com>
Mon, 30 Sep 2019 02:16:04 +0000 (19:16 -0700)
committer Gerrit Code Review <gituser@scgit2.amlogic.com>
Mon, 30 Sep 2019 02:16:04 +0000 (19:16 -0700)
diff --cc drivers/frame_provider/decoder/h264_multi/vmh264.c
Simple merge
author	Hui Zhang <hui.zhang@amlogic.com>
	Mon, 30 Sep 2019 02:16:04 +0000 (19:16 -0700)
committer	Gerrit Code Review <gituser@scgit2.amlogic.com>
	Mon, 30 Sep 2019 02:16:04 +0000 (19:16 -0700)