Merge commit 'b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 14:55:16 +0000 (16:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 15:03:22 +0000 (17:03 +0200)
commit102a1d9239fcfe37a8cee5a691d7533e5eb347fa
tree6f1cb56ef5549e7442692f062a12e74457c71a1d
parent19769766740bf4932c7920ca61d4df41e0610083
parentb1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2
Merge commit 'b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2'

* commit 'b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2':
  ffv1: Make sure at least one slice context is initialized

Conflicts:
libavcodec/ffv1.c

This condition is not possible in ffmpegs ffv1 code and already
checked for by assert() for the case that some future changes make it possible.
Thus merge just for meta-data

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