diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 12:26:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 12:27:07 +0200 |
| commit | ae6429e633d206ef7b4aa662777fd681cd22349a (patch) | |
| tree | 1c52d4e469cc34fa7c4e7598c2a2ee89d12c88aa | |
| parent | a1323ec1793b9800c1dce19de66afc28929e6eef (diff) | |
| parent | 1f1686615c20982a68b2d8db3ff109834a260d27 (diff) | |
| download | ffmpeg-ae6429e633d206ef7b4aa662777fd681cd22349a.tar.gz | |
Merge commit '1f1686615c20982a68b2d8db3ff109834a260d27' into release/2.2
* commit '1f1686615c20982a68b2d8db3ff109834a260d27':
rtpenc_jpeg: Handle case of picture dimensions not dividing by 8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 7eb0e23c6f..d6691f2984 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; /* check if pixel format is not the normal 420 case */ if (s1->streams[0]->codec->pix_fmt == AV_PIX_FMT_YUVJ422P) { |