generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '4415d0f3bbaeb287327ef101ae98d727a69d9af1' into release/2.4

Browse Source 
* commit '4415d0f3bbaeb287327ef101ae98d727a69d9af1':
  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-05-19 20:48:19 +02:00
parent 60d0d68a8d 4415d0f3bb
commit d5f2302aca
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; s->timestamp = s->cur_timestamp;
/* convert video pixel dimensions from pixels to blocks */ /* convert video pixel dimensions from pixels to blocks */
w = s1->streams[0]->codec->width >> 3; w = (s1->streams[0]->codec->width + 7) >> 3;
h = s1->streams[0]->codec->height >> 3; h = (s1->streams[0]->codec->height + 7) >> 3;
/* get the pixel format type or fail */ /* get the pixel format type or fail */
if (s1->streams[0]->codec->pix_fmt == AV_PIX_FMT_YUVJ422P || if (s1->streams[0]->codec->pix_fmt == AV_PIX_FMT_YUVJ422P ||