Merge commit '4438c256387a5845e5cdc5c14c43f4047b68301b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:03:02 +0000 (00:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:03:10 +0000 (00:03 +0100)
* commit '4438c256387a5845e5cdc5c14c43f4047b68301b':
  vf_interlace: remove the warning tag in the message

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/vf_interlace.c

Simple merge