Changeset 45492018 in ffmpeg

Timestamp:

May 19, 2014, 12:28:49 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e98d3a7d

Parents:

84476585 (diff), 4c390b1b (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> (05/19/14 12:28:02)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/19/14 12:28:49)

Message:

Merge commit '4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7'

• commit '4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7': hevc/intra_pred: optimize EXTEND_()*

Conflicts:

libavcodec/hevcpred_template.c

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

(No files)