summaryrefslogtreecommitdiff
path: root/libavformat/rtpenc_jpeg.c
diff options
context:
space:
mode:
authorAndrey Utkin <andrey.krieger.utkin@gmail.com>2015-04-11 00:54:10 +0300
committerMichael Niedermayer <michaelni@gmx.at>2015-04-11 02:26:56 +0200
commit7f64a7503b19b39f1251e4380987034c569bebf5 (patch)
tree9948f383b028b1c82fe810b26e89fd27a214d92f /libavformat/rtpenc_jpeg.c
parentd4a6c9404601ccf0b035477699fa2a9b9b1f515a (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 <silvo@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc_jpeg.c')
-rw-r--r--libavformat/rtpenc_jpeg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c
index c35332953c..9a20cbc376 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 ||