Changeset 30156eab in ffmpeg

Timestamp:

Nov 17, 2014, 10:41:35 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e0785494

Parents:

c192be19 (diff), de1f8ead (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 'de1f8ead8993512925a3ee6c7491473414419e55'

• commit 'de1f8ead8993512925a3ee6c7491473414419e55': hevcdsp_template: templatize transquant_bypass

Conflicts:

libavcodec/hevcdsp_template.c

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

(No files)