mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1'
* commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1': tiffenc: initialize return value Conflicts: libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
d2e0543766
|
@ -235,7 +235,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
|
||||||
int bytes_per_row;
|
int bytes_per_row;
|
||||||
uint32_t res[2] = { s->dpi, 1 }; // image resolution (72/1)
|
uint32_t res[2] = { s->dpi, 1 }; // image resolution (72/1)
|
||||||
uint16_t bpp_tab[4];
|
uint16_t bpp_tab[4];
|
||||||
int ret = -1;
|
int ret = 0;
|
||||||
int is_yuv = 0, alpha = 0;
|
int is_yuv = 0, alpha = 0;
|
||||||
int shift_h, shift_v;
|
int shift_h, shift_v;
|
||||||
int packet_size;
|
int packet_size;
|
||||||
|
|
Loading…
Reference in New Issue