• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/release/9' into release/1.1 · 002ad7cd
    Michael Niedermayer authored
    
    
    * qatar/release/9:
      fate: update ref after rv30_loop_filter fix
      rv30: fix masking in rv30_loop_filter()
      libcdio: support recent cdio-paranoia
      theora: Skip zero-sized headers
      h264: add 3 pixels below for subpixel filter wait position
      h264: fix ff_generate_sliding_window_mmcos() prototype.
      h264: don't clobber mmco opcode tables for non-first slice headers.
    
    Conflicts:
    	configure
    	libavcodec/h264_refs.c
    	tests/ref/fate/filter-delogo
    	tests/ref/fate/rv30
    
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    002ad7cd