OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Dec 2013 11:39:16 +0000 (12:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Dec 2013 11:39:23 +0000 (12:39 +0100)
commit2c0b246b5babc51ac9b7b21a2c88c32d01993efc
treed95edc054d2d6e978c46f5b1dd72f87bb8cbae3c
parent459db51271807ba26162db7b67ac1ff444cc0fa9
parentd06ca2040c0f30345b4aa8e83d824297535953c5
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  error.h: Do not circularly depend on avutil.h

See: 7c2bb79f3b849d12800856379063f99f3b018678
Merged-by: Michael Niedermayer <michaelni@gmx.at>