diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 20:15:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 20:17:33 +0200 |
| commit | 01a39a978c143747b50d0b2660cd100c96722cbd (patch) | |
| tree | 36dc0700a5843973437dd1e2e3259f1e7254d8e0 /libavutil/hash.c | |
| parent | 0c67ef272943c10decb9243c95fc209a7d3f2e12 (diff) | |
| parent | 55ddd700c67529ff2c6c4e976673f1341bba7a82 (diff) | |
| download | ffmpeg-01a39a978c143747b50d0b2660cd100c96722cbd.tar.gz | |
Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'
* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
Silicon Graphics Movie demuxer
Conflicts:
Changelog
libavformat/mvdec.c
libavformat/version.h
See: 6fb40779cd3457a819e20d6db91a142c47cad3c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/hash.c')
0 files changed, 0 insertions, 0 deletions