diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 12:07:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 12:07:56 +0200 |
| commit | 42f5fc716e932b7b015d6605f2d88fc0eea4488b (patch) | |
| tree | 1bf58a087b603ff4db66667390cf148dc2181e68 /CREDITS | |
| parent | e077ba801644c07027e7fee14018dc0f49d01a51 (diff) | |
| parent | 481575d255195c6c2f32e04686b94de984ae78d4 (diff) | |
| download | ffmpeg-42f5fc716e932b7b015d6605f2d88fc0eea4488b.tar.gz | |
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>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions