1. 05 May, 2011 2 commits
    • Michael Niedermayer's avatar
      Merge remote branch 'qatar/master' · b000b86e
      Michael Niedermayer authored
      * qatar/master: (23 commits)
        doc: Check standalone compilation before submitting new components.
        Fix standalone compilation of pipe protocol.
        Fix standalone compilation of ac3_fixed encoder.
        Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
        Fix standalone compilation of IMC decoder.
        Fix standalone compilation of WTV demuxer.
        Fix standalone compilation of MXPEG decoder.
        flashsv: K&R cosmetics
        matroskaenc: fix memory leak
        vc1: make overlap filter for I-frames bit-exact.
        vc1dec: use s->start/end_mb_y instead of passing them as function args.
        Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
        Replace strncpy() with av_strlcpy().
        indeo3: Eliminate use of long.
        get_bits: make cache unsigned to eliminate undefined signed overflow.
        asfdec: fix assert failure on invalid files
        avfilter: check malloc return values.
      Not pulled as reason for reindent is not pulled:  mpegvideo: reindent.
        nutenc: check malloc return values.
      Not pulled due to much simpler solution in ffmpeg  *: don't av_malloc(0).
        ...
      
      Conflicts:
      	doc/developer.texi
      	libavcodec/Makefile
      	libavcodec/get_bits.h
      	libavcodec/mpegvideo.c
      	libavformat/Makefile
      	libavutil/log.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      b000b86e
    • Michael Niedermayer's avatar
  2. 04 May, 2011 38 commits