• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 11a1033c
    Michael Niedermayer authored
    * qatar/master: (23 commits)
      build: cosmetics: Reorder some lists in a more logical fashion
      x86: pngdsp: Fix assembly for OS/2
      fate: add test for RTjpeg in nuv with frameheader
      rtmp: send check_bw as notification
      g723_1: clip argument for 15-bit version of normalize_bits()
      g723_1: use all LPC vectors in formant postfilter
      id3v2: Support v2.2 PIC
      avplay: fix build with lavfi disabled.
      avconv: split configuring filter configuration to a separate file.
      avconv: split option parsing into a separate file.
      mpc8: do not leave padding after last frame in buffer for the next decode call
      mpegaudioenc: list supported channel layouts.
      mpegaudiodec: don't print an error on > 1 frame in a packet.
      api-example: update to new audio encoding API.
      configure: add --enable/disable-random option
      doc: cygwin: Update list of FATE package requirements
      build: Remove all installed headers and header directories on uninstall
      build: change checkheaders to use regular build rules
      rtmp: Add a new option 'rtmp_subscribe'
      rtmp: Add support for subscribing live streams
      ...
    
    Conflicts:
    	Makefile
    	common.mak
    	configure
    	doc/examples/decoding_encoding.c
    	ffmpeg.c
    	libavcodec/g723_1.c
    	libavcodec/mpegaudiodec.c
    	libavcodec/x86/pngdsp.asm
    	libavformat/version.h
    	library.mak
    	tests/fate/video.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    11a1033c
common.mak 3.41 KB