aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorAndrey Utkin <andrey.krieger.utkin@gmail.com>2015-04-11 00:54:10 +0300
committerMartin Storsjö <martin@martin.st>2015-04-23 23:20:03 +0300
commit1bd2646a6da808f6f9881525771db098c54bc3d2 (patch)
treee068560492312cb2f404e13757e186f5e617dc87 /libavformat
parenteb7ddb5066843ab16caf33b05eafb2576648b797 (diff)
downloadffmpeg-1bd2646a6da808f6f9881525771db098c54bc3d2.tar.gz
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. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
-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 9d0915b04b..b8c880aadf 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 = (s1->streams[0]->codec->width + 7) >> 3;
+ h = (s1->streams[0]->codec->height + 7) >> 3;
/* get the pixel format type or fail */
if (s1->streams[0]->codec->pix_fmt == AV_PIX_FMT_YUVJ422P ||