OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 03:39:52 +0000 (04:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 03:39:52 +0000 (04:39 +0100)
commit5b3c68414749e87ef46a7ce19ce75be8c6f3d515
tree063b686e0d40f1e36ed77986f0e85d3cb1b70ed1
parent3f41e57fa869036e42bf26dfaccf0c7b28d0bd19
parent3c8507a845e68b2c0c7fb53ef4c6972db80acf21
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dcadec: add disable_xch private option.

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dcadec.c