• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b008ac18
    Michael Niedermayer authored
    * qatar/master:
      docs: use -bsf:[vas] instead of -[vas]bsf.
      mpegaudiodec: Prevent premature clipping of mp3 input buffer.
      lavf: move the packet keyframe setting code.
      oggenc: free comment header for all codecs
      lcl: error out if uncompressed input buffer is smaller than framesize.
      mjpeg: abort decoding if packet is too large.
      golomb: use HAVE_BITS_REMAINING() macro to prevent infloop on EOF.
      get_bits: add HAVE_BITS_REMAINING macro.
      lavf/output-example: use new audio encoding API correctly.
      lavf/output-example: more proper usage of the new API.
      tiff: Prevent overreads in the type_sizes array.
      tiff: Make the TIFF_LONG and TIFF_SHORT types unsigned.
      apetag: do not leak memory if avio_read() fails
      apetag: propagate errors.
      SBR DSP x86: implement SSE sbr_hf_g_filt
      SBR DSP x86: implement SSE sbr_sum_square_sse
      SBR DSP: use intptr_t for the ixh parameter.
    
    Conflicts:
    	doc/bitstream_filters.texi
    	doc/examples/muxing.c
    	doc/ffmpeg.texi
    	libavcodec/golomb.h
    	libavcodec/x86/Makefile
    	libavformat/oggenc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b008ac18
muxing.c 15.9 KB