am 540b65bc: am 3eda271f: Merge "Clear the decoder input buffer after it...
am 540b65bc: am 3eda271f: Merge "Clear the decoder input buffer after it signalled an error to be able to continue." into jb-dev
* commit '540b65bc':
Clear the decoder input buffer after it signalled an error to be able to continue.