• Michael Niedermayer's avatar
    Merge commit 'f6c38c5f' · 3b0bb321
    Michael Niedermayer authored
    * commit 'f6c38c5f':
      avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)
      rtspdec: Set the default port for listen mode, if none is specified
      tscc2: Fix an out of array access
      rtmpproto: Fix an out of array write
      rtspdec: Fix use of uninitialized byte
      vp8: reset loopfilter delta values at keyframes.
      avutil: add yuva422p and yuva444p formats
    
    Conflicts:
    	libavutil/pixdesc.c
    	libavutil/pixfmt.h
    	tests/ref/lavfi/pixdesc
    	tests/ref/lavfi/pixfmts_copy
    	tests/ref/lavfi/pixfmts_null
    	tests/ref/lavfi/pixfmts_scale
    	tests/ref/lavfi/pixfmts_vflip
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    3b0bb321
rtspdec.c 31.7 KB