Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Dec 2012 07:24:45 +0000 (08:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Dec 2012 07:24:45 +0000 (08:24 +0100)
commit9696ad6a76534b16dfaf9872dd20017f9f8d18e4
tree2d766f16cc4c8db5cfc895f1ef807ed1866084b0
parentfd3cdcaf5f4d4f21e61491f19742092f855e93ac
parent395c3feb3bb165af5760d287a9a64344b6269fe2
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: fix 'clean' target
  ZeroCodec: Flip output

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Makefile
common.mak
libavcodec/version.h
library.mak