Merge commit '2578f1efd64f4efc30114c328d1eff9030429e59'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Jun 2013 08:33:43 +0000 (10:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Jun 2013 08:39:14 +0000 (10:39 +0200)
commit42b8296f36378c1cbd4fa7d278696196e1c49e5d
treecefb7f80aa4bfafb6d1559872bf48b99e4696a02
parent3f54547709c22e3e8db4f1e27ec2a285d208e156
parent2578f1efd64f4efc30114c328d1eff9030429e59
Merge commit '2578f1efd64f4efc30114c328d1eff9030429e59'

* commit '2578f1efd64f4efc30114c328d1eff9030429e59':
  riff: Support ULH0 and ULH2 fourccs.
  utvideodec: Support ULH0 and ULH2 formats.

Conflicts:
libavcodec/utvideodec.c
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>