Merge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 15:52:05 +0000 (16:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 15:52:09 +0000 (16:52 +0100)
commit516f30ed20828c04459cb2fd3b18a0bd2de4cdf0
treeac3ebb07e51372de8a815b417f89c5c61e135adb
parent0ff21c316534776f9b3ba5ae51242ae1a976909e
parent0ee8293a77a6afad161e91ce1d43c4a57ce33a6a
Merge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'

* commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a':
  vp3dsp: don't do aligned reads on input.
  mlp_parser: cosmetics: re-indent.

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