• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7c1aba4f
    Michael Niedermayer authored
    * qatar/master: (21 commits)
      fate: allow testing with libavfilter disabled
      x86: XOP/FMA4 CPU detection support
      ws_snd: misc cosmetic clean-ups
      ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead.
      ws_snd: use memcpy() and memset() instead of loops
      ws_snd: use samples pointer for loop termination instead of a separate iterator variable.
      ws_snd: make sure number of channels is 1
      ws_snd: add some checks to prevent buffer overread or overwrite.
      ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
      flacdec: fix buffer size checking in get_metadata_size()
      rtp: Simplify ff_rtp_get_payload_type
      rtpenc: Add a payload type private option
      rtp: Correct ff_rtp_get_payload_type documentation
      avconv: replace all fprintf() by av_log().
      avconv: change av_log verbosity from ERROR to FATAL for fatal errors.
      cmdutils: replace fprintf() by av_log()
      avtools: parse loglevel before all the other options.
      oggdec: add support for Xiph's CELT codec
      sol: return error if av_get_packet() fails.
      cosmetics: reindent and pretty-print
      ...
    
    Conflicts:
    	avconv.c
    	cmdutils.c
    	libavcodec/avcodec.h
    	libavcodec/version.h
    	libavformat/oggparsecelt.c
    	libavformat/utils.c
    	libavutil/avutil.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7c1aba4f
ffserver.c 155 KB