Merge commit '6503cbf842a026faec517eb980551089168c7d8a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 May 2015 19:34:35 +0000 (21:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 May 2015 19:34:35 +0000 (21:34 +0200)
commit9aff7d41f65a22a281def975ce2f1979e32a4199
tree7250874f486b33689e10f2e0fff323f1cadf6ccc
parentc9ac9adb46f2197fcce9ea22d99235ba12603581
parent6503cbf842a026faec517eb980551089168c7d8a
Merge commit '6503cbf842a026faec517eb980551089168c7d8a'

* commit '6503cbf842a026faec517eb980551089168c7d8a':
  ffv1enc: Add const attribute to input frame

Conflicts:
libavcodec/ffv1.h

no change, the changed field does not exist in FFmpeg

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