Merge commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:05:46 +0000 (17:05 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:06:14 +0000 (17:06 +0200)
commit41194f065c8e9b138db069417494e2f845c7b275
tree5018c3ba815df1f581b3016c1578603363a2b77b
parent7f6b794da051ff4e4235bbc2b84469ff2807a453
parentcad40a3833ad81a352e7657ec6f7d637cea3b798
Merge commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798'

* commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798':
  lavc: Drop deprecated deinterlace module

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/avcodec.h
libavcodec/imgconvert.c
libavcodec/imgconvert.h
libavcodec/version.h
libavcodec/x86/Makefile