OSDN Git Service

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)
commit3e32bf3dbddc1882775ea69e779a5906c3bb5701
tree277ea2a28de3c5ca8218718fab8fe6a4a39c7187
parent6e19cfb083eda83aaf4b49ae765ab2b3e578d32d
parent6a92551234c6966ab59d00052076b79133e6e7e5
Merge remote-tracking branch 'qatar/master'

* 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>
libswscale/utils.c