Changeset abb6821e in ffmpeg

Timestamp:

Feb 14, 2014, 12:51:17 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fd982f2b

Parents:

84873794 (diff), 8a22503 (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> (02/14/14 00:47:06)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/14/14 00:51:17)

Message:

Merge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b'

• commit '8a2250344b19a343d830a902dbcf4c0b929ea49b': jv: detect partial packets in the demuxer

Conflicts:

libavformat/jvdec.c

See: 9d0c71e5e34dec2c6246bf47da8d9674c92f85c1
See: b948ab8132e24d215072120e210139dc456d4997
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)