Changeset 7cd13f6 in ffmpeg

Timestamp:

Aug 3, 2013, 6:54:54 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8e970a58

Parents:

bdccfc3f (diff), 0d8b943d (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 '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'

• commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0': h264_sei: Return meaningful values

Conflicts:

libavcodec/h264_sei.c

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

(No files)