• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e366e6bf
    Michael Niedermayer authored
    * qatar/master:
      ppc: drop unused function dct_quantize_altivec()
      mpegaudiodec: Do not discard mp_decode_frame() return value.
      matroska: do not set invalid default duration if frame rate is zero
      mkv: use av_reduce instead of av_d2q for framerate estimation
      mkv: report average framerate as minimal as well
      avcodec_string: Favor AVCodecContext.codec over the default codec.
      cook: Make constants passed to AV_BE2NE32C() unsigned to avoid signed overflow.
    
    Conflicts:
    	libavcodec/cook.c
    	libavcodec/ppc/mpegvideo_altivec.c
    	libavcodec/utils.c
    	libavformat/matroskadec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e366e6bf
matroskadec.c 79.2 KB