Changeset 018e0db5 in ffmpeg

Timestamp:

Sep 20, 2013, 9:43:32 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

04ee57ce

Parents:

c6b42589 (diff), 09f3c93 (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.

Message:

Merge commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9'

• commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9': asfenc: remember send time and offset of the index entries

Conflicts:

libavformat/asfenc.c

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

(No files)