Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Nov 2012 17:12:13 +0000 (18:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Nov 2012 17:12:13 +0000 (18:12 +0100)
commitea5adf7080403ad70a3827830c26319823f49adc
treed36bd774e5da69f9a5ebe51c84282e3c5b4d7cb8
parentb044e81f069cc97488868c3f2ef393c193644f0c
parent17fecb4a59926fc85d76efd0d0405f1aa84e429b
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  flashsv: Drop unused function and struct parameters
  pcm: fix decoding of pcm_s16le_planar on big-endian

Conflicts:
libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/flashsv.c