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

rtpenc_jpeg: handle case of picture dimensions not dividing by 8 

This fixes the calculation of the number of needed blocks to make
sure that ALL pixels are represented by the result.

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7f64a7503b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Andrey Utkin 2015-04-11 00:54:10 +03:00 committed by Michael Niedermayer
parent 3bb17d2692
commit 4c2a1e673b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtpenc_jpeg.c
View File

@ -40,8 +40,8 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size)
s->timestamp = s->cur_timestamp; s->timestamp = s->cur_timestamp;
/* convert video pixel dimensions from pixels to blocks */ /* convert video pixel dimensions from pixels to blocks */
w = s1->streams[0]->codec->width >> 3; w = FF_CEIL_RSHIFT(s1->streams[0]->codec->width, 3);
h = s1->streams[0]->codec->height >> 3; h = FF_CEIL_RSHIFT(s1->streams[0]->codec->height, 3);
/* get the pixel format type or fail */ /* get the pixel format type or fail */
if (s1->streams[0]->codec->pix_fmt == AV_PIX_FMT_YUVJ422P || if (s1->streams[0]->codec->pix_fmt == AV_PIX_FMT_YUVJ422P ||