[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 11 02:07:00 2013 +0200| [0f88a98b43b8ae41529a15c52b35b5d1bbef3197] | committer: Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f88a98b43b8ae41529a15c52b35b5d1bbef3197
---