• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 8c1ebdce
    Michael Niedermayer authored
    * qatar/master:
      shorten: Use separate pointers for the allocated memory for decoded samples.
      atrac3: Fix crash in tonal component decoding.
      ws_snd1: Fix wrong samples counts.
      movenc: Don't set a default sample duration when creating ismv
      rtp: Factorize the check for distinguishing RTCP packets from RTP
      golomb: avoid infinite loop on all-zero input (or end of buffer).
      bethsoftvid: synchronize video timestamps with audio sample rate
      bethsoftvid: add audio stream only after getting the first audio packet
      bethsoftvid: Set video packet duration instead of accumulating pts.
      bethsoftvid: set packet key frame flag for audio and I-frame video packets.
      bethsoftvid: fix read_packet() return codes.
      bethsoftvid: pass palette in side data instead of in a separate packet.
      sdp: Ignore RTCP packets when autodetecting RTP streams
      proresenc: initialise 'sign' variable
      mpegaudio: replace memcpy by SIMD code
      vc1: prevent using last_frame as a reference for I/P first frame.
    
    Conflicts:
    	libavcodec/atrac3.c
    	libavcodec/golomb.h
    	libavcodec/shorten.c
    	libavcodec/ws-snd1.c
    	tests/ref/fate/bethsoft-vid
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8c1ebdce
ws-snd1.c 5.76 KB