[FFmpeg-cvslog] Merge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 20 22:13:29 2015 +0200| [bde7f5b135c772e0122fd5df616e6de46e157167] | committer: Michael Niedermayer

Merge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'

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

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bde7f5b135c772e0122fd5df616e6de46e157167
---