Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'

* commit '481575d255195c6c2f32e04686b94de984ae78d4':
  avconv: remove -deinterlace

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg.c
	ffmpeg_opt.c

The merge removes the documentation for the deprecated -deinterlace
the code itself has already been replaced a while ago by code
that inserts yadif, that insertion code is left in place.

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

doc/ffmpeg.texi

@@ -532,10 +532,6 @@ list separated with slashes. Two first values are the beginning and
 end frame numbers, last one is quantizer to use if positive, or quality
 factor if negative.
 
-@item -deinterlace
-Deinterlace pictures.
-This option is deprecated since the deinterlacing is very low quality.
-Use the yadif filter with @code{-filter:v yadif}.
 @item -ilme
 Force interlacing support in encoder (MPEG-2 and MPEG-4 only).
 Use this option if your input file is interlaced and you want