1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavcodec
Michael Niedermayer b000b86e1d 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>
2011-05-05 03:30:24 +02:00
..
2011-05-02 03:45:58 +02:00
2011-04-19 10:16:07 +02:00
2011-05-05 03:30:24 +02:00
2011-04-30 01:58:26 +02:00
2011-04-30 01:58:26 +02:00
2011-04-17 23:43:54 +02:00
2011-04-28 04:26:01 +02:00
2011-04-28 04:26:01 +02:00
2011-04-28 04:26:01 +02:00
2011-04-28 04:26:01 +02:00
2011-04-24 03:41:22 +02:00
2011-04-27 03:51:04 +02:00
2011-04-24 03:41:22 +02:00
2011-04-27 03:51:04 +02:00
2011-04-17 23:43:54 +02:00
2011-05-02 03:45:58 +02:00
2011-04-27 03:51:04 +02:00
2011-05-02 03:45:58 +02:00
2011-04-05 02:31:56 +02:00
2011-05-05 03:30:24 +02:00
2011-05-04 02:22:12 +02:00
2011-03-28 00:16:44 +02:00
2011-03-28 00:16:44 +02:00
2011-05-05 03:30:24 +02:00
2011-04-11 23:39:12 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-04-17 23:43:54 +02:00
2011-04-27 03:51:04 +02:00
2011-04-17 23:43:54 +02:00
2011-04-27 03:51:04 +02:00
2011-04-26 22:06:13 +02:00
2011-04-26 22:06:13 +02:00
2011-05-02 02:58:09 +02:00
2011-05-01 19:35:55 +02:00
2011-04-30 01:58:26 +02:00
2011-05-04 23:33:59 +02:00
2011-04-02 01:54:27 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-04-29 18:31:17 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-04-25 00:20:03 +02:00
2011-04-25 00:20:03 +02:00
2011-04-27 03:51:04 +02:00
2011-05-05 03:30:24 +02:00
2011-04-19 13:25:05 +02:00
2011-04-23 01:09:43 +02:00
2011-05-05 03:30:24 +02:00
2011-05-03 22:35:19 -04:00
2011-04-17 23:43:54 +02:00
2011-04-17 23:43:54 +02:00
2011-05-04 02:22:12 +02:00
2011-04-26 18:25:24 +02:00
2011-04-20 04:48:23 +02:00
2011-04-06 02:59:49 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-04-17 23:43:54 +02:00
2011-04-03 16:40:12 +02:00
2011-04-20 04:48:23 +02:00
2011-04-17 23:43:54 +02:00
2011-03-28 00:16:44 +02:00
2011-04-27 21:49:45 +02:00
2011-04-27 21:49:45 +02:00
2011-04-17 23:43:54 +02:00
2011-04-24 03:41:22 +02:00
2011-04-28 04:26:01 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-05-01 19:35:55 +02:00
2011-04-30 01:58:26 +02:00
2011-04-30 01:58:26 +02:00
2011-04-30 01:58:26 +02:00
2011-04-24 03:41:22 +02:00
2011-05-03 04:08:23 +02:00
2011-05-03 04:08:23 +02:00
2011-04-23 01:09:43 +02:00
2011-04-27 03:51:04 +02:00
2011-04-30 01:58:26 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-04-23 01:09:43 +02:00
2011-04-20 04:48:23 +02:00