Changeset e0785494 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c23d7de2

Parents:

30156eab (diff), a7b365ae (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 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139'

• commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139': hevc: reduce code duplication in hls_prediction_unit()

Conflicts:

libavcodec/hevc.c

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

(No files)