• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 6716e689
    Michael Niedermayer authored
    * qatar/master:
      FATE: Add ZeroCodec test
      oggparseogm: fix order of arguments of avpriv_set_pts_info().
      pngenc: better upper bound for encoded frame size.
      aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C
      aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF
      aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C
      aiffdec: do not set bit rate if block duration is unknown
      wmall: output packet only if we have decoded some samples
    
    Conflicts:
    	libavcodec/pngenc.c
    	tests/fate/lossless-video.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6716e689
aiffdec.c 10.2 KB