Merge commit '7cade8ea2bb19e78dae42b29720535a70fb2ae84'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Apr 2014 21:03:17 +0000 (23:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Apr 2014 21:03:20 +0000 (23:03 +0200)
commit417ae6281b9bddc24e1f5f11632079ff0f4639ef
tree72ee0b820d4ab6622001e3c89db2304c34b04b5c
parent23cd5cb18f55c84bae48b08ff6563d5301c451d9
parent7cade8ea2bb19e78dae42b29720535a70fb2ae84
Merge commit '7cade8ea2bb19e78dae42b29720535a70fb2ae84'

* commit '7cade8ea2bb19e78dae42b29720535a70fb2ae84':
  on2avc: change a comment at #endif to match actual define

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/on2avcdata.h