Changeset 9c2e31c in ffmpeg

Timestamp:

Sep 24, 2013, 1:03:32 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

af2bb83d

Parents:

0ebc3728 (diff), 26179964 (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 '26179964ff3fa1173e6f512c5735ba8223e2395d'

• commit '26179964ff3fa1173e6f512c5735ba8223e2395d': h264_sei: log unknown sei messages

Conflicts:

libavcodec/h264_sei.c

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

(No files)