Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Nov 2012 12:06:12 +0000 (13:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Nov 2012 12:06:12 +0000 (13:06 +0100)
commit130dc9518779eb1b389d0cdf7348802e2b25f201
tree32686c5b876b16dab4125d6667bb0d80096d70b9
parentabf91f7fee326fae0d70ca1a481c51e8eab1dd5e
parentda5408ede972ab474f7df9023471a7bcd7092abb
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add a bink version 'b' test
  FATE: add a bink version 'i' test
  libswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJOR

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/swscale.h
tests/fate/video.mak