Changeset d9bb7fc3 in ffmpeg

Timestamp:

Feb 2, 2014, 4:40:30 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ef034cb

Parents:

493f750e (diff), 816e5b99 (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 '816e5b997028c8215c804b1e58b2388592ed612b'

• commit '816e5b997028c8215c804b1e58b2388592ed612b': hevc: Reject impossible slice segment

Conflicts:

libavcodec/hevc.c

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

(No files)