Changeset ef4e54e0 in ffmpeg

Timestamp:
Nov 13, 2014, 12:23:42 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ccfae038
Parents:
94cf1ef0 (diff), 28d82b76 (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> (11/13/14 12:22:02)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/13/14 12:23:42)
Message:

Merge commit '28d82b7675bea76a1349070a3cdd737d964d4775'

Conflicts:

libavcodec/vc1_mc.c
tests/ref/fate/vc1_ilaced_twomv

Theres no change to the reference checksums as this bug was not
in FFmpeg

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

(No files)

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