Changeset 982920cf in ffmpeg

Timestamp:

Jul 3, 2014, 11:19:34 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

44f079b2

Parents:

33f6ba9c (diff), df949b64 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (07/03/14 11:15:33)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/03/14 11:19:34)

Message:

Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5'

• commit 'df949b645b12d62bb4da56d629a887c81f67f2e5': hevc: Use the local context variable when needed

Conflicts:

libavcodec/hevc.c

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

(No files)