Merge commit 'e4fb53c73abece15a7c5df0019df9a0371db2297' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Aug 2014 18:47:07 +0000 (20:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Aug 2014 18:47:54 +0000 (20:47 +0200)
commit081f4f5f56e0f6220039e39b9be2c2a2021dd40c
treeaeb240725399c0183fdad326aa245697422e9162
parentf953c3c2343dc78c45a001aa38ecb20cee447df7
parente4fb53c73abece15a7c5df0019df9a0371db2297
Merge commit 'e4fb53c73abece15a7c5df0019df9a0371db2297' into release/1.1

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

Conflicts:
libavcodec/ffv1dec.c

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