Changeset acc7cf7 in ffmpeg

Timestamp:

Jun 26, 2014, 5:58:25 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

932be89c

Parents:

057d2704 (diff), 9b60d919 (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> (06/26/14 17:56:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/26/14 17:58:25)

Message:

Merge commit '9b60d9197970658e91daf4b586397f450de9af69'

• commit '9b60d9197970658e91daf4b586397f450de9af69': hevc: Allow out of bound values for num_reorder_pics

Conflicts:

libavcodec/hevc_ps.c

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

(No files)