Changeset e98d3a7d in ffmpeg

Timestamp:

May 19, 2014, 12:47:29 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3791741c

Parents:

45492018 (diff), 25bb7eaf (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 '25bb7eaf9eb14e6e00264bf584aa4d380d3bc29f'

• commit '25bb7eaf9eb14e6e00264bf584aa4d380d3bc29f': hevc/intra_pred: drop unnecessary conditions in loops

Conflicts:

libavcodec/hevcpred_template.c

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

(No files)