Changeset 12a40424 in ffmpeg

Timestamp:

Dec 11, 2013, 10:08:45 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

dee6d5f5

Parents:

1dbb3cfa (diff), 33452ae (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> (12/11/13 22:05:04)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/11/13 22:08:45)

Message:

Merge commit '33452aede6acab78f726cd1924824585f00765cc'

• commit '33452aede6acab78f726cd1924824585f00765cc': hevc: store the VPS list as an AVBufferRef, just like the others *PS

Conflicts:

libavcodec/hevc.c
libavcodec/hevc_ps.c

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

(No files)