• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 151ecc2a
    Michael Niedermayer authored
    * qatar/master: (26 commits)
      avconv: deprecate the -deinterlace option
      doc: Fix the name of the new function
      aacenc: make sure to encode enough frames to cover all input samples.
      aacenc: only use the number of input samples provided by the user.
      wmadec: Verify bitstream size makes sense before calling init_get_bits.
      kmvc: Log into a context at a log level constant.
      mpeg12: Pad framerate tab to 16 entries.
      kgv1dec: Increase offsets array size so it is large enough.
      kmvc: Check palsize.
      nsvdec: Propagate errors
      nsvdec: Be more careful with av_malloc().
      nsvdec: Fix use of uninitialized streams.
      movenc: cosmetics: Get rid of camelCase identifiers
      swscale: more generic check for planar destination formats with alpha
      doc: Document mov/mp4 fragmentation options
      build: Use order-only prerequisites for creating FATE reference file dirs.
      x86 dsputil: provide SSE2/SSSE3 versions of bswap_buf
      rtsp: Remove some unused variables from ff_rtsp_connect().
      avutil: make intfloat api public
      avformat_write_header(): detail error message
      ...
    
    Conflicts:
    	doc/APIchanges
    	doc/ffmpeg.texi
    	doc/muxers.texi
    	ffmpeg.c
    	libavcodec/kmvc.c
    	libavcodec/x86/Makefile
    	libavcodec/x86/dsputil_yasm.asm
    	libavcodec/x86/pngdsp-init.c
    	libavformat/movenc.c
    	libavformat/movenc.h
    	libavformat/mpegtsenc.c
    	libavformat/nsvdec.c
    	libavformat/utils.c
    	libavutil/avutil.h
    	libswscale/swscale.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    151ecc2a
mpegtsenc.c 36.1 KB