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)
* 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>
1  2 
libavcodec/flashsv.c

Simple merge