ffmpeg/libavformat
Michael Niedermayer d1c28e3530 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: fix standalone compilation of OMA muxer
  build: fix standalone compilation of Microsoft XMV demuxer
  build: fix standalone compilation of Core Audio Format demuxer
  kvmc: fix invalid reads
  4xm: Add a check in decode_i_frame to prevent buffer overreads
  adpcm: fix IMA SMJPEG decoding
  options: set minimum for "threads" to zero
  bsd: use number of logical CPUs as automatic thread count
  windows: use number of CPUs as automatic thread count
  linux: use number of CPUs as automatic thread count
  pthreads: reset active_thread_type when slice thread_init returrns early
  v410dec: include correct headers
  Drop ALT_ prefix from BITSTREAM_READER_LE name.
  lavfi: always build vsrc_buffer.
  ra144enc: zero the reflection coeffs if the filter is unstable
  sws: readd PAL8 to isPacked()
  mov: Don't stick the QuickTime field ordering atom in extradata.
  truespeech: fix invalid reads in truespeech_apply_twopoint_filter()

Conflicts:
	configure
	libavcodec/4xm.c
	libavcodec/avcodec.h
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavformat/Makefile
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-23 03:25:51 +01:00
..
2011-11-30 20:34:45 +01:00
2011-12-22 04:12:45 +01:00
2011-12-12 20:21:47 +01:00
2011-11-05 16:51:25 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2011-12-13 21:08:43 +01:00
2011-11-30 20:34:45 +01:00
2011-08-01 00:58:49 +02:00
2011-08-22 09:35:58 +02:00
2011-08-09 19:56:25 +02:00
2011-11-30 20:34:45 +01:00
2011-12-04 16:44:20 +01:00
2011-11-03 20:21:01 +01:00
2011-12-22 00:25:47 +01:00
2011-12-14 03:38:57 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-08-09 19:56:25 +02:00
2011-12-13 23:07:40 +01:00
2011-12-20 22:38:53 +01:00
2011-12-18 16:23:16 +01:00
2011-12-10 22:02:44 +01:00
2011-10-13 16:50:20 +02:00
2011-12-17 03:25:46 +01:00
2011-12-18 23:54:56 +01:00
2011-12-01 15:32:20 +00:00
2011-11-30 17:39:32 +02:00
2011-12-22 04:12:45 +01:00
2011-12-19 19:11:49 +01:00
2011-12-16 06:02:14 +01:00
2011-12-22 04:12:45 +01:00