* commit '59245e0c':
  avconv: set the encoding/decoding_needed flags earlier

Conflicts:
	ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>