merge: OMX_ErrorTimeout is more correct
[rbp/omxplayer] Detect bitstream corrupt and reject CMYK jpegs