Changeset 357a733f in ffmpeg

Timestamp:

Jan 18, 2014, 8:29:37 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f2cb3b36

Parents:

06637c92 (diff), d1b3fabe (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:21:09)

git-committer:

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

Message:

Merge commit 'd1b3fabe6945e511bb20fc9ca52b47eb952526ee'

• commit 'd1b3fabe6945e511bb20fc9ca52b47eb952526ee': h264: reset first_field if frame_start() fails for missing refs

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

(No files)