Merge commit '4415d0f3bbaeb287327ef101ae98d727a69d9af1' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 18:48:19 +0000 (20:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 18:48:25 +0000 (20:48 +0200)
* commit '4415d0f3bbaeb287327ef101ae98d727a69d9af1':
  rtpenc_jpeg: Handle case of picture dimensions not dividing by 8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpenc_jpeg.c

Simple merge