Merge commit '2473eb4a33b226758e1f5db322cb8d687ce01602' * commit '2473eb4a33b226758e1f5db322cb8d687ce01602': Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
Merge commit '2473eb4a33b226758e1f5db322cb8d687ce01602' * commit '2473eb4a33b226758e1f5db322cb8d687ce01602': Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable