Merge commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 20:29:07 +0000 (22:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 20:29:11 +0000 (22:29 +0200)
commitd84286b1ea1a59ecc770666a665ce71aa1e75c8f
treee734e5d3c3eb19667169c0b1c1433ed160f4cfa8
parent5be8c276946d9228cddfa8049bd49eeaf542eb81
parentf1df0a4c08b54e722e7a2c797d0d31c7f2c531d0
Merge commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0'

* commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0':
  on2avc: Remove pointless dsputil.h #include

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