• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 027264cb
    Michael Niedermayer authored
    * qatar/master: (31 commits)
      ARM: add ARMv6 optimised av_clip_uintp2
      ARM: remove volatile from asm statements in libavutil/intmath
      ARM: fix av_clipl_int32_arm()
      v4l: include avdevice.h
      ffserver: move close_connection() call to avoid a temporary string and copy.
      lavf: initialize demuxer private options.
      AVOptions: set string default values.
      lavdevice: mark v4l for removal on next major bump.
      swscale: fix compile on ppc.
      swscale: fix compile on x86-32.
      build: Remove generated .version file on distclean.
      configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2.
      doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected.
      ffplay: Remove disabled code.
      Mark parameterless function declarations as 'void'.
      swscale: use av_clip_uint8() in yuv2yuv1_c().
      swscale: remove VOF/VOFW.
      swscale: split chroma buffers into separate U/V planes.
      swscale: replace formatConvBuffer[VOF] by allocated array.
      rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.
      ...
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    027264cb
ffserver.c 155 KB