Merge commit 'cdf6eb5a9710566be217a3f17d3d94ac4e4d2662'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Apr 2014 23:04:29 +0000 (01:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Apr 2014 23:06:15 +0000 (01:06 +0200)
commit8b2c3d2ae9515860f0be15d3ec8905a303140f97
treed1c2e4101981cfb9ac814ff259ea745be984c381
parent7228bdeebd2835172b4c3697e1e681399531f3e6
parentcdf6eb5a9710566be217a3f17d3d94ac4e4d2662
Merge commit 'cdf6eb5a9710566be217a3f17d3d94ac4e4d2662'

* commit 'cdf6eb5a9710566be217a3f17d3d94ac4e4d2662':
  vc1: Do not return an error when skipping b frames

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