Changeset cd69c0e0 in ffmpeg

Timestamp:

Apr 24, 2015, 1:08:19 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0f776df0

Parents:

f8951d36 (diff), 1bd2646a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/24/15 01:01:56)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/24/15 01:08:19)

Message:

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>

(No files)