Changeset eaaa5801 in ffmpeg

Timestamp:

Mar 9, 2014, 8:44:40 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8a5397d

Parents:

06219db9 (diff), 4d33873c (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 '4d33873c2990b8d6096f60fef384f0efc4482b55'

• commit '4d33873c2990b8d6096f60fef384f0efc4482b55': hevc: make pps/sps ids unsigned where necessary

Conflicts:

libavcodec/hevc.h
libavcodec/hevc_ps.c

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

(No files)