[vlc-commits] Avcodec/swscale: use AV_PIX_FMT consistently

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug 31 08:19:00 2015 +0200| [348fda699ca59892ccad704a25cb1b11da04df20] | committer: Rafaël Carré

Avcodec/swscale: use AV_PIX_FMT consistently

(cherry picked from commit faa7bd357b1f9e07a6ffbc451a188773fad7a275)
Signed-off-by: Rafaël Carré <funman at videolan.org>

Conflicts:
	modules/codec/avcodec/chroma.c
	modules/codec/avcodec/video.c

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=348fda699ca59892ccad704a25cb1b11da04df20
---

 modules/codec/avcodec/chroma.c |  104 ++++++++++++++++++++--------------------
 modules/codec/avcodec/video.c  |   10 ++--
 modules/video_chroma/swscale.c |   28 +++++------
 3 files changed, 71 insertions(+), 71 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=348fda699ca59892ccad704a25cb1b11da04df20