RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb' into release/2.4 

* commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb':
  tiffenc: initialize return value

Conflicts:
	libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-18 02:00:54 +01:00
parent 5b965a508c b82170336f
commit 49f477071d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/tiffenc.c
View File

@ -252,7 +252,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;