Changeset d195e6e4 in ffmpeg

Timestamp:

Sep 24, 2013, 1:38:34 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1fb0d961

Parents:

af2bb83d (diff), 71cabb52 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (09/24/13 13:38:08)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/24/13 13:38:34)

Message:

Merge commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6'

• commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6': h264: do not discard NAL_SEI when skipping frames

Conflicts:

libavcodec/h264.c

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

(No files)