Merge commit 'b5d7b80a7e43779ca2962ba56442579c2a7e927d' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 18:28:37 +0000 (20:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 18:28:37 +0000 (20:28 +0200)
commit497d66126242a94c32c146434e543ee2833e6349
treeaf57a50fe5a4cb179cf491833407cfd3bd4cef0f
parent8044ab94e485d2c40ff8d87a7907f31ed2ebc997
parentb5d7b80a7e43779ca2962ba56442579c2a7e927d
Merge commit 'b5d7b80a7e43779ca2962ba56442579c2a7e927d' into release/0.10

* commit 'b5d7b80a7e43779ca2962ba56442579c2a7e927d':
  ffv1dec: check that global parameters do not change in version 0/1

Conflicts:
libavcodec/ffv1.c

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