OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 459db51 d06ca20)
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)
* qatar/master:
  error.h: Do not circularly depend on avutil.h

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

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help