diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:00:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:00:54 +0100 |
| commit | 49f477071dcda8bc956b30020808d05c005577e0 (patch) | |
| tree | 2657449383379dc560785900a71dc47c86b69f74 /libavcodec/xiph.c | |
| parent | 5b965a508ca3a5a3002d8d2449e03f4f6e5d7689 (diff) | |
| parent | b82170336f90d06c645d8252ddeccfc92c2f9ccb (diff) | |
| download | ffmpeg-49f477071dcda8bc956b30020808d05c005577e0.tar.gz | |
Merge commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb' into release/2.4
* commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb':
tiffenc: initialize return value
Conflicts:
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xiph.c')
0 files changed, 0 insertions, 0 deletions