Changeset d6acf45e in ffmpeg

Timestamp:

Dec 17, 2013, 6:30:57 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9be63be1

Parents:

4e1dc60 (diff), 3d9fc21e (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 '3d9fc21e593aa89b5877bd739268499b079052f2'

• commit '3d9fc21e593aa89b5877bd739268499b079052f2': h264: Refactor decode_frame_packing_arrangement

Conflicts:

libavcodec/h264_sei.c

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

(No files)