Merge "m4v_h263: fix global buffer overflow" into lmp-dev am: c41471f6df
am: 643dd1d8d4

Change-Id: I4550a8fa2b3d7f65f0a5e3af96b5251c7566422c