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

Simple merge
Simple merge