Merge commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 13:12:22 +0000 (15:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 13:12:45 +0000 (15:12 +0200)
* commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2':
  i263: skip dummy frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/intelh263dec.c

Simple merge