[FFmpeg-cvslog] Merge commit '1bd2646a6da808f6f9881525771db098c54bc3d2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 24 03:01:56 2015 +0200| [cd69c0e0181c2815ac239803b7edfa3f600e1c50] | committer: Michael Niedermayer

Merge commit '1bd2646a6da808f6f9881525771db098c54bc3d2'

* commit '1bd2646a6da808f6f9881525771db098c54bc3d2':
  rtpenc_jpeg: Handle case of picture dimensions not dividing by 8

Conflicts:
	libavformat/rtpenc_jpeg.c

See: 7f64a7503b19b39f1251e4380987034c569bebf5
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd69c0e0181c2815ac239803b7edfa3f600e1c50
---