Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Dec 2012 13:29:15 +0000 (14:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Dec 2012 13:51:06 +0000 (14:51 +0100)
commitcbed2426a0299b33d1c88c110e6ccfad6fc6f0e1
tree931bee676ef434095205090478e70fd2ea9a4dd8
parent384dd9804d63fead9bb884a52ff53c17348741e9
parentd615da60c1f95359d972a1cdf1d5e937930bda3f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  snow: use VideoDSPContext

Conflicts:
libavcodec/snow.c

Nothing merged here, this has already been fixed in ffmpeg long ago

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