Merge commit '9047491f'

* commit '9047491f': swscale: add nv12/nv21->yuv420 converter Conflicts: libswscale/rgb2rgb.c libswscale/rgb2rgb_template.c See: ef627bf9Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '9047491f'
* commit '9047491f': swscale: add nv12/nv21->yuv420 converter Conflicts: libswscale/rgb2rgb.c libswscale/rgb2rgb_template.c See: ef627bf9Merged-by: Michael Niedermayer <michaelni@gmx.at>
53feab7a · Michael Niedermayer · 797d8078 · 9047491f · 53feab7a · 53feab7a
Commit 53feab7a authored Jan 21, 2014 by Michael Niedermayer
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

rgb2rgb.c libswscale/rgb2rgb.c +2 -2

rgb2rgb_template.c libswscale/rgb2rgb_template.c +1 -1

No files found.
--- a/libswscale/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
--- a/libswscale/rgb2rgb_template.c
+++ b/libswscale/rgb2rgb_template.c