Changeset b000b86e in ffmpeg

Timestamp:

May 5, 2011, 1:30:24 AM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

175714c0

Parents:

9a5624a0 (diff), af1ca249 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (05/05/11 01:09:48)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/05/11 01:30:24)

Message:

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 <​michaelni@gmx.at>

(No files)