Commit Graph

13 Commits

Author SHA1 Message Date
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
Michael Niedermayer
bef8dfa056 escape130: replace can_safely_read() by get_bits_left()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 18:31:32 +01:00
Michael Niedermayer
f7da12350e escape130: give all av_log() a context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 18:31:32 +01:00
Michael Niedermayer
40d6296095 escape130: The minimum read in and after decode_skip_count() is 4 bits.
Thus we can check for 4 being available.
If the next block is skiped we need 4 bits to encode the skip. If the
next block is not skiped then we need 1 bit for the skip code and
at least 3 bits for the block.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 18:31:32 +01:00
Michael Niedermayer
59d3656f6e escape130: Check dimensions to be a multiple of the block size.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 18:31:21 +01:00
Carl Eugen Hoyos
8ac6469575 Silence a warning when compiling Escape 130 decoder.
Fixes:
libavcodec/escape130.c:177:17: warning: ISO C90 forbids mixed declarations and code

Reviewed-by: Paul B Mahol
2011-12-08 17:14:47 +01:00
Michael Niedermayer
31c55c572a escape130: 10l for myself for not initializing y_base.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 13:25:40 +01:00
Michael Niedermayer
06798c6e3b escape130: Fix y_base handling, this fixes some artifacts, vissible in most videos.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 06:01:50 +01:00
Michael Niedermayer
8ff3d1ccec escape130: make sure cliping is done on signed values.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 05:59:36 +01:00
Paul B Mahol
7bd8b70f19 escape130: fix colors 2011-12-02 01:19:42 +00:00
Paul B Mahol
1e8f77324e escape130: remove trailing whitespace 2011-12-01 15:32:21 +00:00
Paul B Mahol
06029fbb7f escape130: minimal effort to make it compile without warnings 2011-12-01 15:32:20 +00:00
Eli Friedman
7d64391441 Escape 130 (RPL) decoder 2011-12-01 15:32:20 +00:00