* commit 'c872d310':
  avconv: stop accessing AVStream.parser

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