* commit '674fa491':
  avconv: do not call avcodec_get_frame_defaults()

Conflicts:
	ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>