Changeset 402b18af in ffmpeg

Timestamp:
Jun 8, 2015, 8:15:28 PM (9 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
01a6ae13
Parents:
83e3516e (diff), caf7be30 (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> (06/08/15 20:14:18)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/08/15 20:15:28)
Message:

Merge commit 'caf7be30b11288c498fae67be4741bfbf083d977'

Conflicts:

libavformat/mpjpegdec.c

See: 34d278f9838e355b3b2c7a9c0f77d7fcaf37ce49, this was mistakenly reimplemented, also see ffmpeg IRC log of today
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)

Note: See TracChangeset for help on using the changeset viewer.