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 | |
| parent | 1db2d39dfddacb50546c9cdc1071f42146b23fa6 (diff) | |
| parent | 0562887a984388fdc7a9b71c9374ff9c756fb4f1 (diff) | |
| download | ffmpeg-streaming-d2e0543766e0c8c077ab51495991f47066d9e768.zip ffmpeg-streaming-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')
| -rw-r--r-- | libavcodec/tiffenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 5f3324b..72219da 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -235,7 +235,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, int bytes_per_row; uint32_t res[2] = { s->dpi, 1 }; // image resolution (72/1) uint16_t bpp_tab[4]; - int ret = -1; + int ret = 0; int is_yuv = 0, alpha = 0; int shift_h, shift_v; int packet_size; |
