* commit 'd6006dd9':
  libvpxenc: Do not entangle coded_frame

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