Merge commit '73af0a9211d0c4be663d287cefd9bf35746db1ba' * commit '73af0a9211d0c4be663d287cefd9bf35746db1ba': Fix software avc encoder crash at EOS.
Merge commit '73af0a9211d0c4be663d287cefd9bf35746db1ba' * commit '73af0a9211d0c4be663d287cefd9bf35746db1ba': Fix software avc encoder crash at EOS.