Merge commit '5a4e9fe855282a99586050a507d0a486ad39df5b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 22:56:07 +0000 (23:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 23:01:32 +0000 (00:01 +0100)
commitff9b607489e6b295d57b9b97f1c23b0a66b273a6
tree80809ec3d8a177a713f5706fafc4a7985e51cb78
parent90f8b2ce48cfbffeb64779a8c2d55a1e078b4657
parent5a4e9fe855282a99586050a507d0a486ad39df5b
Merge commit '5a4e9fe855282a99586050a507d0a486ad39df5b'

* commit '5a4e9fe855282a99586050a507d0a486ad39df5b':
  avcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatch
  shorten: use the unsigned type where needed

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