Changeset a9ef21bb in ffmpeg

Timestamp:

Dec 18, 2011, 10:11:05 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f371396d

Parents:

1c73391d (diff), 0e764cf5 (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/18/11 22:10:58)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/18/11 22:11:05)

Message:

Merge remote-tracking branch 'tjoppen/proper_mxf_track_linking'

• tjoppen/proper_mxf_track_linking: mxfdec: Don't parse slices or DeltaEntryArrays mxfdec: Remove dead/useless code mxfdec: Hybrid demuxing/seeking solution mxfdec: Add mxf_edit_unit_absolute_offset() mxfdec: Replace zero IndexDurations with st->duration mxfdec: Add "fake" index to MXFIndexTable to assist seeking mxfdec: Add MXFIndexTables mxfdec: Move mxf_read_packet*() near the bottom of the file

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

(No files)