diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 23:24:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 23:29:47 +0200 |
| commit | 5297003aa7a06e0223f3842b810d9fb10f67789d (patch) | |
| tree | c03c5432b66b9dd0ab71b8368e09d97e5f666632 /libavcodec/flacdsp_template.c | |
| parent | 787be6d0749603a73f268af8a3262428ff02d31e (diff) | |
| parent | eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123 (diff) | |
| download | ffmpeg-5297003aa7a06e0223f3842b810d9fb10f67789d.tar.gz | |
Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123'
* commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123':
LucasArts SMUSH demuxer
Conflicts:
Changelog
doc/general.texi
libavformat/smush.c
libavformat/version.h
See: bef8fd7099edfac9c487e6eb75d7e6116ad80465
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacdsp_template.c')
0 files changed, 0 insertions, 0 deletions