• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b4780d03
    Michael Niedermayer authored
    * qatar/master:
      x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2
      rational: add av_inv_q() returning the inverse of an AVRational
      dpx: Make start offset unsigned
      lavfi: properly signal out-of-memory error in ff_filter_samples
      cosmetics: Fix a few switched periods and linebreaks
      zerocodec: Fix memleak in decode_frame
      zerocodec: Cosmetics
    
    Conflicts:
    	ffmpeg.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b4780d03
rational.h 3.85 KB