[FFmpeg-cvslog] Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  8 12:07:56 2013 +0200| [42f5fc716e932b7b015d6605f2d88fc0eea4488b] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42f5fc716e932b7b015d6605f2d88fc0eea4488b
---