Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Oct 2012 12:38:03 +0000 (14:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Oct 2012 12:46:13 +0000 (14:46 +0200)
commit82c0055c5e71f2289936e6c2528bed5826c18c43
treee4510e6a8cf751182378f293f7a8bc4f253c0097
parentdb51c65961bd692fc6ebb12c2f4183699d3db9c0
parentb5198a2637b7b45b0049a1d4b386a06f016f2520
Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'

* commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520':
  configure: tms470: add mapping for -mfpu=vfpv3-d16 flag
  configure: recognise Minix as OS
  configure: work around bug in ash shell
  eval-test: make table static const
  lavr: handle clipping in the float to s32 conversion
  nut: support pcm codecs not mapped in avi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
doc/nut.texi
libavformat/nut.c
libavformat/nut.h
libavformat/nutdec.c
libavutil/eval.c