Changeset 84476585 in ffmpeg

Timestamp:

May 19, 2014, 12:10:13 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

45492018

Parents:

93318983 (diff), a1c2b48 (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 'a1c2b48018b09d2613f075ec0748c95bd520ac00'

• commit 'a1c2b48018b09d2613f075ec0748c95bd520ac00': hevc: templatize intra_pred

Conflicts:

libavcodec/hevc.h

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

(No files)