Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 May 2013 10:07:56 +0000 (12:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 May 2013 10:07:56 +0000 (12:07 +0200)
commit42f5fc716e932b7b015d6605f2d88fc0eea4488b
tree1bf58a087b603ff4db66667390cf148dc2181e68
parente077ba801644c07027e7fee14018dc0f49d01a51
parent481575d255195c6c2f32e04686b94de984ae78d4
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