[FFmpeg-cvslog] Merge commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 19 15:12:22 2014 +0200| [47c8d1e174b8677bb3c9f6e2ce0c37907b3a8886] | committer: Michael Niedermayer

Merge commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2'

* commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2':
  i263: skip dummy frames

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

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