* commit '56672aea':
  svq1enc: Do not entangle coded_frame

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