• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · c137fdd7
    Michael Niedermayer authored
    * qatar/master:
      swscale: remove misplaced comment.
      ffmpeg: fix streaming to ffserver.
      swscale: split out RGB48 output functions from yuv2packed[12X]_c().
      build: move vpath directives to main Makefile
      swscale: fix JPEG-range YUV scaling artifacts.
      build: move ALLFFLIBS to a more logical place
      ARM: factor some repetitive code into macros
      Fix SVQ3 after adding 4:4:4 H.264 support
      H.264: fix CODEC_FLAG_GRAY
      4:4:4 H.264 decoding support
      ac3enc: fix allocation of floating point samples.
    
    Conflicts:
    	ffmpeg.c
    	libavcodec/dsputil_template.c
    	libavcodec/h264.c
    	libavcodec/mpegvideo.c
    	libavcodec/snow.c
    	libswscale/swscale.c
    	libswscale/swscale_internal.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c137fdd7
common.mak 2.63 KB