Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Aug 2011 19:47:21 +0000 (21:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Aug 2011 19:47:21 +0000 (21:47 +0200)
* qatar/master:
  lsws: remove optimization debug logs in sws_init_context()
  lsws: use array for storing the supported in/out information

Conflicts:
libswscale/utils.c

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

Simple merge