Merge "Removed shadow warnings : bitstream.c encodeframe.c onyx_if.c"