[FFmpeg-cvslog] Merge commit '5a4e9fe855282a99586050a507d0a486ad39df5b'

Michael Niedermayer git at videolan.org
Thu Mar 7 00:10:08 CET 2013 

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  6 23:56:07 2013 +0100| [ff9b607489e6b295d57b9b97f1c23b0a66b273a6] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff9b607489e6b295d57b9b97f1c23b0a66b273a6
---

More information about the ffmpeg-cvslog mailing list