* commit '91767360':
  a64multienc: Do not entangle coded_frame

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