[FFmpeg-cvslog] Merge commit 'ded5957d75def70d2f1fc1c1eae079230004974b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 24 20:50:44 2015 +0200| [41070923490a678911435fb1d65bba04c6bf2a5e] | committer: Michael Niedermayer

Merge commit 'ded5957d75def70d2f1fc1c1eae079230004974b'

* commit 'ded5957d75def70d2f1fc1c1eae079230004974b':
  segafilm: Remove deplanarization hack

Conflicts:
	libavformat/segafilm.c
	libavformat/version.h

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

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