Merge commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 21:03:57 +0000 (22:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 21:05:06 +0000 (22:05 +0100)
commit3b3782d74e5a5827e4a52f0be990decd6a303654
treef2c0f8efc9d4e06603d5f808d8a68934bfaac27f
parentf4cc19cdd082aa07db2f6fd1c5fbc2b674a74a63
parent0352ff102d62ee94e79e0baaf64d5ad4e66f907b
Merge commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b'

* commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b':
  ffv1: const correctness for encode_rgb_frame()

Conflicts:
libavcodec/ffv1enc.c

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