Changeset aee51ee8 in ffmpeg

Timestamp:
Jan 16, 2015, 12:53:34 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
2d0440f9
Parents:
a0aa3eaa (diff), 2df72777 (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> (01/16/15 12:10:04)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (01/16/15 12:53:34)
Message:

Merge commit '2df7277711cbe3ca5415ff8e31228dcffa309211'

Conflicts:

libswscale/input.c
tests/ref/fate/filter-pixfmts-scale

Not merged, the code works fine as is and does not work with this
change

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

(No files)

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