« Previous | Next » 

Revision b000b86e

IDb000b86e1dd03c4ff89cd63a6fa88fc280947c94
Parent 9a5624a0, af1ca249
Child 175714c0

Added by Michael Niedermayer over 9 years ago

Merge remote branch 'qatar/master'

  • 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: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted