• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7fad19a6
    Michael Niedermayer authored
    * qatar/master:
      x86: cabac: replace explicit memory references with "m" operands
      avplay: don't request a stereo downmix
      wmapro: use av_float2int()
      lavc: avoid invalid memcpy() in avcodec_default_release_buffer()
      lavu: replace int/float punning functions
      lavfi: install libavfilter/vsrc_buffer.h
      Remove extraneous semicolons
      sdp: Restore the original mp4 format h264 extradata if converted
      rtpenc: Add support for mp4 format h264
      rtpenc: Simplify code by introducing a separate end pointer
      movenc: Use the actual converted sample for RTP hinting
      Fix a bunch of common typos.
    
    Conflicts:
    	doc/developer.texi
    	doc/eval.texi
    	doc/filters.texi
    	doc/protocols.texi
    	ffmpeg.c
    	ffplay.c
    	libavcodec/mpegvideo.h
    	libavcodec/x86/cabac.h
    	libavfilter/Makefile
    	libavformat/avformat.h
    	libavformat/cafdec.c
    	libavformat/flvdec.c
    	libavformat/flvenc.c
    	libavformat/gxfenc.c
    	libavformat/img2.c
    	libavformat/movenc.c
    	libavformat/mpegts.c
    	libavformat/rtpenc_h264.c
    	libavformat/utils.c
    	libavformat/wtv.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7fad19a6
soxenc.c 3.8 KB