Changeset 42a29015 in ffmpeg

Timestamp:

Jan 21, 2014, 2:04:24 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7c4b96f5

Parents:

e34ad128 (diff), a7a07cc (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> (01/21/14 14:03:10)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/21/14 14:04:24)

Message:

Merge commit 'a7a07cc98ac548297b5b0628cb81280e11952e3f'

• commit 'a7a07cc98ac548297b5b0628cb81280e11952e3f': hevc: check that VPS referenced from SPS exists

Conflicts:

libavcodec/hevc_ps.c

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

(No files)