Merge commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 12:28:57 +0000 (13:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 12:28:57 +0000 (13:28 +0100)
* commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1':
  tiffenc: initialize return value

Conflicts:
libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/tiffenc.c

index 5f3324b..72219da 100644 (file)
@@ -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;