Changeset 93318983 in ffmpeg

Timestamp:
May 19, 2014, 11:56:56 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
84476585
Parents:
4a30f085 (diff), 04db5794 (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.
Message:

Merge commit '04db5794cd97e4b33ec2f963ef7f967722a456eb'

Conflicts:

libavcodec/hevcpred_template.c

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

(No files)

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