diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 23:34:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 23:34:36 +0100 |
| commit | d06dce21a454f541acec329aa5299e67cd9d0994 (patch) | |
| tree | 9c66eabd3425eb25a3bf5ad9c5ad4e6f6e84307b /libavutil/twofish.c | |
| parent | 41572ac698b3ad0b9cfda31e546d6d45c3f962dd (diff) | |
| parent | 42c8f92e2fa390fa17b03d37b4323ec0d721d4cd (diff) | |
| download | ffmpeg-d06dce21a454f541acec329aa5299e67cd9d0994.tar.gz | |
Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'
* commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd':
wmv2: Return meaningful error codes
Conflicts:
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/twofish.c')
0 files changed, 0 insertions, 0 deletions