* commit '41776ba9':
  avconv: do not use the stream codec context for decoding

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