[FFmpeg-cvslog] Merge commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct  3 11:13:37 2013 +0200| [c4f3b55f507955a5db45802b09a1a38ff7f8bb8d] | committer: Michael Niedermayer

Merge commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76'

* commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76':
  vf_interlace: do not process an already interlaced frame

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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