diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-10 10:33:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-10 10:39:14 +0200 |
| commit | 42b8296f36378c1cbd4fa7d278696196e1c49e5d (patch) | |
| tree | cefb7f80aa4bfafb6d1559872bf48b99e4696a02 /libavcodec/xxan.c | |
| parent | 3f54547709c22e3e8db4f1e27ec2a285d208e156 (diff) | |
| parent | 2578f1efd64f4efc30114c328d1eff9030429e59 (diff) | |
| download | ffmpeg-42b8296f36378c1cbd4fa7d278696196e1c49e5d.tar.gz | |
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>
Diffstat (limited to 'libavcodec/xxan.c')
0 files changed, 0 insertions, 0 deletions