* commit '420aa06a':
  avconv: do not overwrite the stream codec context for streamcopy

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