[FFmpeg-cvslog] Merge commit 'a529fa2f4dd3292ba7d9cd3e6ba76425b1ba7aef'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 27 13:09:10 2013 +0200| [fc424f37a37ee6ba6fb679db746775b63f602267] | committer: Michael Niedermayer

Merge commit 'a529fa2f4dd3292ba7d9cd3e6ba76425b1ba7aef'

* commit 'a529fa2f4dd3292ba7d9cd3e6ba76425b1ba7aef':
  lxf: remove deplanarization hack

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

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