Changeset 32961030 in ffmpeg

Timestamp:

Jan 18, 2014, 8:51:40 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

59fb3c4b

Parents:

f2cb3b36 (diff), 00dbff4c (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> (01/18/14 20:45:58)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/18/14 20:51:40)

Message:

Merge commit '00dbff4c3e048b4abd01bf805725aabff0fa5ee1'

• commit '00dbff4c3e048b4abd01bf805725aabff0fa5ee1': h264: do not call field_end if we do not have a current picture

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

(No files)