Merge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 19:44:53 +0000 (21:44 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 19:44:53 +0000 (21:44 +0200)
commitf2a581e2eeecf85c0e58e1a4bea905d717807045
tree51f776a1ccfcb056079464da07a947cc36718310
parenta99f0ad194fd48ae8afd9264595b7ca6f45e2a8a
parent05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024
Merge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'

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

Conflicts:
libavcodec/proresenc_kostya.c

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