eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-11 09:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '1f1686615c20982a68b2d8db3ff109834a260d27' into release/2.2

Browse Source 
* commit '1f1686615c20982a68b2d8db3ff109834a260d27':
  rtpenc_jpeg: Handle case of picture dimensions not dividing by 8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-01 12:26:51 +02:00
parent a1323ec179 1f1686615c
commit ae6429e633
1 changed files with 2 additions and 2 deletions
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;
/* 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) {