Changeset 4e1dc60 in ffmpeg

Timestamp:

Dec 17, 2013, 6:04:32 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d6acf45e

Parents:

682b28b4 (diff), 3a149e23 (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 '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c'

• commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c': hevc: Refactor decode_nal_sei_frame_packing_arrangement

Conflicts:

libavcodec/hevc_sei.c

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

(No files)