• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · feb99757
    Michael Niedermayer authored
    * qatar/master: (25 commits)
      riff: fix invalid av_freep() calls on EOF in ff_read_riff_info
      pam: Fix a typo that broke writing and reading PAM files.
      mxfdec: fix memleak on av_realloc failures
      mxfdec: Do not parse slices or DeltaEntryArrays.
      mxfdec: hybrid demuxing/seeking solution
      mxfdec: Add Avid's essence element key.
      mfxdec: Separate mxf_essence_container_uls for audio and video.
      mxfdec: Compute packet offsets properly.
      mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack.
      mxfdec: use av_dlog() for 'no corresponding source package found'
      mxfdec: Make mxf->partitions sorted by offset.
      mxfdec: parse ThisPartition
      mxfdec: Speed up metadata and index parsing.
      mxfdec: Make sure DataDefinition is consistent between material track and source track.
      mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf
      mxfdec: Add hack that adjusts the n_delta calculation when system items are present.
      mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays.
      mxfdec: Move FooterPartition to MXFContext and make sure it is never zero.
      mxfdec: check return value of avio_seek
      mxfdec: skip to end of structural sets
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
ffserver.c 155 KB