diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-24 13:28:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-24 13:28:57 +0100 |
| commit | d2e0543766e0c8c077ab51495991f47066d9e768 (patch) | |
| tree | 780ee902be56fe81c8d479f2993f68f33ee04056 /libavcodec/aacsbr.c | |
| parent | 1db2d39dfddacb50546c9cdc1071f42146b23fa6 (diff) | |
| parent | 0562887a984388fdc7a9b71c9374ff9c756fb4f1 (diff) | |
| download | ffmpeg-d2e0543766e0c8c077ab51495991f47066d9e768.tar.gz | |
Merge commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1'
* commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1':
tiffenc: initialize return value
Conflicts:
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacsbr.c')
0 files changed, 0 insertions, 0 deletions