Changeset 020baa0b in ffmpeg

Timestamp:
Mar 17, 2014, 3:12:25 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
987b873
Parents:
ca0e6fa7 (diff), 1c1fbc70 (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> (03/17/14 15:10:17)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/17/14 15:12:25)
Message:

Merge commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347'

Conflicts:

libavcodec/mjpegdec.c

See: 2f870e262e953815060de0ebea9b6653133b203e
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)

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