Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Jun 2012 18:55:37 +0000 (20:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Jun 2012 18:56:06 +0000 (20:56 +0200)
commit90d8506fbf1b5d9bd6ed1f01a8610df01771e3c3
tree36f219ad7d67eca3542a179e6eb0d84fcf3367e4
parentbe32145e9da7b8a7150011ba98bf411fd720c060
parentfbc57405664876cb7f47f1ac264db16a3014e665
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  af_resample: fix format modifier in debug string for FF_API_SAMPLERATE64
  segment: remove unnecessary <strings.h> include
  fate: add snow hpel tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/segment.c
tests/fate/vcodec.mak