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)
* commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f':
  libtheoraenc: Keep coded_frame.key_frame a write-only variable

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

Simple merge