Changeset 3791741c in ffmpeg

Timestamp:

May 19, 2014, 1:03:42 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2de2b991

Parents:

e98d3a7d (diff), c9f8809e (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 'c9f8809ee4c576d5833865039bc1c85754448f67'

• commit 'c9f8809ee4c576d5833865039bc1c85754448f67': hevc/intra_pred: simplify neighboring sample derivation

Conflicts:

libavcodec/hevcpred_template.c

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

(No files)