Changeset 879ea06b in ffmpeg

Timestamp:

Dec 8, 2014, 8:04:30 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6b4cbfec

Parents:

c9128c2c (diff), 90411b33 (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> (12/08/14 20:02:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/08/14 20:04:30)

Message:

Merge commit '90411b333d6b6bb69d8937117b9250785730dc53'

• commit '90411b333d6b6bb69d8937117b9250785730dc53': Allow reading of growing avi files (currently being written)

Conflicts:

libavformat/avidec.c
tests/ref/fate/cvid-partial

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

(No files)