Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 00:32:37 +0000 (01:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 00:32:37 +0000 (01:32 +0100)
commitb7d8484f272b7a5a2ed9db76d5182dbd6e3e6992
treebcccbc78b279cd208a485fac81998118a415926e
parent78ac7ee97040a2e9a69b81f82a89edd779e124bb
parentb8f3ab8e6a7ce3627764da53b809628c828d4047
Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'

* commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047':
  ac3dec: output planar float only
  svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
  configure: Have protocols select network code instead of depending on it

Conflicts:
libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/ac3dec.c
libavcodec/ac3dec.h
libavcodec/svq3.c