am 1c178d3e: am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requires it"

* commit '1c178d3e7b8d037ac8d348922ba841b28eee662f':
  avcenc: Only do startcode escaping if the next byte requires it