diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 03:01:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 03:08:19 +0200 |
| commit | cd69c0e0181c2815ac239803b7edfa3f600e1c50 (patch) | |
| tree | 0da8e0d41ffc12d96cf2323d6eba5eaad4c5919c /libavcodec | |
| parent | f8951d36dfca2f131b867aaecd7510f007aaf503 (diff) | |
| parent | 1bd2646a6da808f6f9881525771db098c54bc3d2 (diff) | |
| download | ffmpeg-cd69c0e0181c2815ac239803b7edfa3f600e1c50.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions