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)
commitd5f2302aca4bde75eee56a18121e0ad25a1de331
tree39f116f222766932c88a6ae46d1a85db52fdcdff
parent60d0d68a8d6ac857e534df375c184a0ad232887a
parent4415d0f3bbaeb287327ef101ae98d727a69d9af1
Merge commit '4415d0f3bbaeb287327ef101ae98d727a69d9af1' into release/2.4

* commit '4415d0f3bbaeb287327ef101ae98d727a69d9af1':
  rtpenc_jpeg: Handle case of picture dimensions not dividing by 8

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