diff options
| author | Andrey Utkin <[email protected]> | 2015-04-11 00:54:10 +0300 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-07-20 04:43:38 +0200 |
| commit | 4c2a1e673bfd269af9ab5c21483b5b6ec0d14063 (patch) | |
| tree | 8795c6bcd080dcd872463a74a2da7a0361c5157d | |
| parent | 3bb17d2692cd790a7213d49f59032b6810e16a02 (diff) | |
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 <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 7f64a7503b19b39f1251e4380987034c569bebf5)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavformat/rtpenc_jpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c index 2e13e178b4..7ee26c435e 100644 --- a/libavformat/rtpenc_jpeg.c +++ b/libavformat/rtpenc_jpeg.c @@ -40,8 +40,8 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size) s->timestamp = s->cur_timestamp; /* convert video pixel dimensions from pixels to blocks */ - w = s1->streams[0]->codec->width >> 3; - h = s1->streams[0]->codec->height >> 3; + w = FF_CEIL_RSHIFT(s1->streams[0]->codec->width, 3); + h = FF_CEIL_RSHIFT(s1->streams[0]->codec->height, 3); /* get the pixel format type or fail */ if (s1->streams[0]->codec->pix_fmt == AV_PIX_FMT_YUVJ422P || |