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)
commit47c8d1e174b8677bb3c9f6e2ce0c37907b3a8886
treecc56967569d011c46428299dd52a98bc55dada3d
parent08c5859f17ed6c16d7e59ea63c63d85cc0d9427f
parentb2290bf10b12b7772f55fcab014a47e18e9fdef2
Merge commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2'

* commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2':
  i263: skip dummy frames

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