• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 15c6be8c
    Michael Niedermayer authored
    * qatar/master:
      tiertexseq: set correct block_align for audio
      tiertexseq: set audio stream start time to 0
      voc/avs: Do not change the sample rate mid-stream.
      segafilm: use the sample rate as the time base for audio streams
      ea: fix audio pts
      psx-str: fix audio pts
      vqf: set packet duration
      tta demuxer: set packet duration
      mpegaudio_parser: do not ignore information from the first parsed frame
      mpegaudio_parser: be less picky about the start position
      thp: set audio packet durations
      avcodec: add a Vorbis parser to get packet duration
      vorbisdec: read the previous window flag for long windows
      lavc: free the output packet when encoding failed or produced no output.
      lavc: preserve avpkt->destruct in ff_alloc_packet().
      lavc: clarify the meaning of AVCodecContext.frame_number.
      mpegts: Pad the packet buffer in handle_packet().
      mpegts: Do not call read_sl_header() when no bytes remain in the buffer.
    
    Conflicts:
    	libavcodec/mpegaudio_parser.c
    	libavcodec/version.h
    	libavformat/mpegts.c
    	tests/ref/fate/pva-demux
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    15c6be8c
mpegts.c 73.8 KB