1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Michael Niedermayer 2822361ed1 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  prores: get correct size for coded V plane if alpha is present
  prores: do not set pixel format on codec init
  pthread: prevent updating AVCodecContext from itself in frame_thread_free
  pthread: copy coded frame dimensions in update_context_from_thread
  vp8: prevent read from uninitialized memory in decode_mvs
  vp8: force reallocation in update_thread_context after frame size change
  vp8: fix return value if update_dimensions fails
  matroskadec: fix out of bounds write
  adpcmdec: calculate actual number of output samples for each decoder.
  adpcmdec: check remaining buffer size before decoding next block in the ADPCM IMA WAV decoder.
  adpcmdec: do not terminate early in ADPCM IMA Duck DK3 decoder.
  adpcmdec: remove unneeded buf_size==0 check.
  adpcmdec: remove unneeded zeroing of *data_size
  dnxhdenc: fixed signed multiplication overflow

Conflicts:
	tests/ref/fate/prores-alpha
	tests/ref/fate/truemotion1-24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-16 04:02:09 +02:00
..
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
amv
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-06-30 09:47:32 +01:00
2010-03-15 19:23:24 +00:00
caf
2010-03-15 19:23:24 +00:00
2011-10-12 03:47:51 +02:00
2010-03-15 19:23:24 +00:00
crc
2011-07-03 17:17:54 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
dpx
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-08-28 11:46:03 +00:00
2010-08-28 11:46:03 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-01-22 03:08:21 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-07-04 16:26:26 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
md5
2011-07-03 18:19:18 +01:00
2010-03-15 19:23:24 +00:00
2010-08-31 11:13:14 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-07-17 10:50:25 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-04-19 11:51:40 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-07-11 12:44:32 +00:00
ptx
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
rl2
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-08-17 15:00:42 +02:00
sha
2010-08-31 20:07:38 +00:00
2010-03-15 19:23:24 +00:00
2011-09-14 11:13:54 +03:00
smc
2011-01-14 22:32:26 +00:00
2010-03-15 19:23:24 +00:00
2010-12-28 23:52:53 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
tmv
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-09-07 12:16:15 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
vp3
2010-08-25 17:23:38 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-04-13 14:29:13 +00:00
w64
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-03-22 11:07:46 +00:00
2010-03-15 19:23:24 +00:00
2010-08-28 14:51:51 +00:00
2010-03-15 19:23:24 +00:00
yop
2010-07-11 00:07:31 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00