diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 22:00:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 22:19:16 +0200 |
| commit | 881f4e8d344044956d8ed3ee370e5c1bd882e1a1 (patch) | |
| tree | 36f3ead18d2f52929b0a72fc0d4a7af7af8fd0a3 /libavcodec/wavpackenc.c | |
| parent | a0568ed2544025de3c66dd500811f5ba43f38af4 (diff) | |
| parent | a420ccd4f2a011887451a7d5e1bebba4fd7c40e2 (diff) | |
| download | ffmpeg-881f4e8d344044956d8ed3ee370e5c1bd882e1a1.tar.gz | |
Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'
* commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2':
LucasArts SMUSH SANM video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/sanm.c
libavcodec/version.h
See: 69254f46286099588514454f60fad12f6e51b2cd and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wavpackenc.c')
0 files changed, 0 insertions, 0 deletions