[FFmpeg-cvslog] Merge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 20 21:44:53 2015 +0200| [f2a581e2eeecf85c0e58e1a4bea905d717807045] | committer: Michael Niedermayer

Merge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'

* commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024':
  proresenc: Do not entangle coded_frame

Conflicts:
	libavcodec/proresenc_kostya.c

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

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