Merge commit 'ca09effb01e126b0ac74ff3de70a475423ddee82'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 20:54:26 +0000 (21:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 20:54:26 +0000 (21:54 +0100)
commitf4cc19cdd082aa07db2f6fd1c5fbc2b674a74a63
treed47be977ce07848e286869f2c6f35457bd0f0fcb
parent90de28befd88fccb2a4d96d55e1d72eac96c4278
parentca09effb01e126b0ac74ff3de70a475423ddee82
Merge commit 'ca09effb01e126b0ac74ff3de70a475423ddee82'

* commit 'ca09effb01e126b0ac74ff3de70a475423ddee82':
  ffv1: Drop unnecessary casts and const qualifiers to match function signatures

Conflicts:
libavcodec/ffv1dec.c

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