• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 4a519b6e
    Michael Niedermayer authored
    * qatar/master:
      mov: Use defines for sample flags in fragments
      mov: Use defines for trun flags
      mov: Use defines for tfhd flags
      proresenc: force bitrate not to exceed given limit
      vc1parse: call vc1_init_common().
      wma: don't return 0 on invalid packets.
      asf: prevent packet_size_left from going negative if hdrlen > pktlen.
      mjpegb: don't return 0 at the end of frame decoding.
      rtpdec: Identify incorrectly signalled H263
      vp8dsp: split long line.
      aiff: don't skip block_align==0 check on COMM-after-SSND files.
      dpcm: ignore extra unpaired bytes in stereo streams.
      mp3on4: require a minimum framesize.
      mpc7: assign an error level + context to av_log() msg.
      huffyuv: error out on bit overrun.
      dct-test: Add the missing ff_ prefix to the altivec functions
      dct-test: Remove a stray declaration of a nonexistent function
      movenc: Write the unknown duration as 64 bit fields in ismv
      movenc: Write track durations with all bits set if duration is unknown
    
    Conflicts:
    	libavcodec/dct-test.c
    	libavcodec/wmadec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4a519b6e
rtpdec_formats.h 2.79 KB