Michael Niedermayer 42f5fc716e 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>

2013-05-08 12:07:56 +02:00

54 KiB

Raw Blame History

View Raw