Merge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 20:13:29 +0000 (22:13 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 20:13:42 +0000 (22:13 +0200)
commitbde7f5b135c772e0122fd5df616e6de46e157167
treed4356978b249b3361c193f94046a6dfc9bd6a668
parent96504b3f72a7fad602fbbb06d85633c52ceaf8da
parentf3b4a92241a33d444f7f6018ebc12e2e3a2d335f
Merge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'

* commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f':
  libtheoraenc: Keep coded_frame.key_frame a write-only variable

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/libtheoraenc.c