Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 13:07:27 +0000 (14:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 13:07:27 +0000 (14:07 +0100)
commitf2b89f21cc3dfcfda911e621c3ea62f3175eacbe
tree984cf3d1534a4ef08d645f8b467ac6cb6ce44a1b
parent0b1896543446491ed3d28aea82e3f990ec514c65
parent7b41c24c5fa221b55a9302efaf1a9eeb38b12551
Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551'

* commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551':
  sws: dont enable chrSrcHSubSample for planar RGB

Conflicts:
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/utils.c