[FFmpeg-cvslog] Merge remote-tracking branch 'cus/stable'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun  9 20:09:51 2012 +0200| [94632dbb1e034f5f9870718f1320ff086889f77c] | committer: Michael Niedermayer

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix return value of get_video_frame if avcodec_decode_video fails

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

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