OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Oct 2012 13:53:42 +0000 (15:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Oct 2012 13:53:42 +0000 (15:53 +0200)
commit775d41b617f0758b0869c7f7edfc947ff393e734
tree0f826cdfda75bc189bed163cce598bf6b5f148d9
parent940ee636301aa73a38e5b3fa025f43901008538b
parentc75848cd4c0961f8cfa9dbbce6c8c12641aa5124
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Add support for Tilera processors
  wavdec: check size before reading the data, not after.

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavformat/wavdec.c