RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
49,945 Commits 36 Branches 398 Tags 233 MiB
Commit Graph

49945 Commits

Author SHA1 Message Date
Michael Niedermayer 701e9b8254 h264: Use mb itself as memcpy anchor and assert the other anchors position 
This makes the code more robust against reordering or fields.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-14 00:42:20 +01:00
Ronald S. Bultje faf8eca08d h264: remove clear_blocks call in threading init. 
Init code in that if statement goes down from 26716 cycles to 26047
cycles, i.e. the removal of the clear_blocks and smaller memcpy()
together save around 670 cycles.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-14 00:15:02 +01:00
Michael Niedermayer c230af9bcc h264: Reset last_pocs in case of reference or frame number inconsistencies 
This prevents faulty increasing of has_b_frames
Should fix Ticket 2062

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 23:19:51 +01:00
Clément Bœsch 15e7533ca1 doc/dev: clarify public symbols prefixes. 2013-02-13 20:19:32 +01:00
Daniel Verkamp 5dd78ef34e WAV muxer: reindent 2013-02-13 17:36:55 +00:00
Michael Niedermayer 21cd905cd4 swr: check channel layouts before using them. 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 17:50:24 +01:00
Paul B Mahol 34126cd090 lavfi/transpose: support more pix fmts 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-13 16:29:47 +00:00
Paul B Mahol cf73e0bff3 lavu/intreadwrite: add AV_[RW][BLN]48 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-13 15:35:54 +00:00
Michael Niedermayer 324d96644b libvorbisdec: Remove AVFrame from context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 16:07:07 +01:00
Michael Niedermayer fe84577273 libvorbisdec: set sample type 
Fixes regression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 15:42:36 +01:00
Nicolas George a17ececcc7 libcelt: decode directly to the user-provided AVFrame. 2013-02-13 15:05:16 +01:00
Nicolas George b68dd8a161 lavf/concatdec: allow probing. 2013-02-13 14:58:50 +01:00
Nicolas George db9dc5154d lavf/concatdec: add signature directive. 2013-02-13 14:58:50 +01:00
Nicolas George 6d680d20ad lavf/concatdec: add safe option. 2013-02-13 14:58:50 +01:00
Michael Niedermayer b2e57eb5a3 mjpegdec: pass nb_components into ljpeg_decode_yuv_scan 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 14:20:46 +01:00
Paul B Mahol 8f7c7ff2d6 evrcdec: decode directly to the user-provided AVFrame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-13 12:33:48 +00:00
Paul B Mahol 2cced2a854 paf: decode directly to the user-provided AVFrame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-13 12:33:48 +00:00
Paul B Mahol 9145818ecd vima: decode directly to the user-provided AVFrame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-13 12:33:48 +00:00
Michael Niedermayer 845fa2f5c9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavr: fix mixing matrix reduction when normalization is disabled
  lavr: fix matrix reduction for upmixing in certain cases
  lavr: cosmetics: reindent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 12:58:29 +01:00
Michael Niedermayer 91043de825 Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90' 
* commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90':
  lavr: make sure that the mix function is reset even if no mixing will be done
  lavr: print out the mix matrix in ff_audio_mix_set_matrix()
  ws-snd1: decode directly to the user-provided AVFrame
  wmavoice: decode directly to the user-provided AVFrame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 12:54:08 +01:00
Michael Niedermayer 0dff771f31 Merge commit '205a95f7b5178362874bc1e65eae9866723491c1' 
* commit '205a95f7b5178362874bc1e65eae9866723491c1':
  wmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContext
  wma: decode directly to the user-provided AVFrame
  wmapro: decode directly to the user-provided AVFrame
  wavpack: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 12:49:48 +01:00
Michael Niedermayer dca6fb08a7 Merge commit 'ee6ca11b657515ad736ec0d2b8635e098d0a2680' 
* commit 'ee6ca11b657515ad736ec0d2b8635e098d0a2680':
  vorbis: decode directly to the user-provided AVFrame
  vmdaudio: decode directly to the user-provided AVFrame
  twinvq: decode directly to the user-provided AVFrame
  tta: decode directly to the user-provided AVFrame
  truespeech: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/tta.c
	libavcodec/twinvq.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 12:42:14 +01:00
Michael Niedermayer 2becf21d9f Merge commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca' 
* commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca':
  tak: decode directly to the user-provided AVFrame
  smackaud: decode directly to the user-provided AVFrame
  sipr: decode directly to the user-provided AVFrame
  shorten: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/shorten.c
	libavcodec/takdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 12:35:37 +01:00
Michael Niedermayer 08059f6150 Merge commit '5d5c248c3df30fa91a8dde639618c985b9a11c53' 
* commit '5d5c248c3df30fa91a8dde639618c985b9a11c53':
  s302m: decode directly to the user-provided AVFrame
  ra288: decode directly to the user-provided AVFrame
  ra144: decode directly to the user-provided AVFrame
  ralf: decode directly to the user-provided AVFrame
  qdm2: decode directly to the user-provided AVFrame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 12:28:27 +01:00
Michael Niedermayer 65da700704 Merge commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8' 
* commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8':
  qcelp: decode directly to the user-provided AVFrame
  pcm-bluray: decode directly to the user-provided AVFrame
  nellymoser: decode directly to the user-provided AVFrame
  mpc7/8: decode directly to the user-provided AVFrame
  mpegaudio: decode directly to the user-provided AVFrame
  mlp/truehd: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/mpc7.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 12:22:35 +01:00
Michael Niedermayer afe30fe060 Merge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f' 
* commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f':
  mace: decode directly to the user-provided AVFrame
  libspeex: decode directly to the user-provided AVFrame
  libopus: decode directly to the user-provided AVFrame
  libopencore-amr: decode directly to the user-provided AVFrame
  libgsm: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/libopusdec.c
	libavcodec/mace.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 12:14:46 +01:00
Michael Niedermayer 5459cf4114 Merge commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2' 
* commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2':
  libilbc: decode directly to the user-provided AVFrame
  dpcm: decode directly to the user-provided AVFrame
  imc/iac: decode directly to the user-provided AVFrame
  gsm: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/dpcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 12:05:00 +01:00
Michael Niedermayer d88e674a15 Merge commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05' 
* commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05':
  g726: decode directly to the user-provided AVFrame
  g723.1: decode directly to the user-provided AVFrame
  g722: decode directly to the user-provided AVFrame
  flac: decode directly to the user-provided AVFrame
  cinaudio: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/g723_1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 11:59:51 +01:00
Michael Niedermayer 0a5138695a Merge commit '182821cff43f5f977004d105b86c47ceb20d00d6' 
* commit '182821cff43f5f977004d105b86c47ceb20d00d6':
  dca: decode directly to the user-provided AVFrame
  cook: decode directly to the user-provided AVFrame
  comfortnoise: decode directly to the user-provided AVFrame
  bmvaudio: decode directly to the user-provided AVFrame
  pcm: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 11:53:23 +01:00
Michael Niedermayer f03cdbd045 Merge commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20' 
* commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20':
  binkaudio: decode directly to the user-provided AVFrame
  atrac3: decode directly to the user-provided AVFrame
  atrac1: decode directly to the user-provided AVFrame
  ape: decode directly to the user-provided AVFrame
  amrwb: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/amrwbdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 11:45:25 +01:00
Michael Niedermayer d13f434dbb Merge commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31' 
* commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31':
  amrnb: decode directly to the user-provided AVFrame
  als: decode directly to the user-provided AVFrame
  alac: decode directly to the user-provided AVFrame
  adxenc: alloc/free coded_frame instead of keeping it in the ADXContext
  adx: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/alsdec.c
	libavcodec/amrnbdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 11:39:05 +01:00
Michael Niedermayer 4789955ec4 Merge commit 'e57daa876bf0cf50782550e366e589441cd8c2bd' 
* commit 'e57daa876bf0cf50782550e366e589441cd8c2bd':
  adpcm: decode directly to the user-provided AVFrame
  ac3: decode directly to the user-provided AVFrame
  aac: decode directly to the user-provided AVFrame
  8svx: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/8svx.c
	libavcodec/ac3dec.c
	libavcodec/adpcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 11:27:54 +01:00
Daniel Verkamp 2acd5fb553 doc/demuxers: quote command line arguments with @code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 04:13:55 +01:00
Michael Niedermayer 4f1279154e shorten: dont leave invalid channel counts in the context. 
Fixes freeing invalid addresses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 01:04:20 +01:00
Michael Niedermayer e1219cdaf9 tiff: Check buffer allocation and pointer increment more carefully in shorts2str() and double2str() 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 23:49:41 +01:00
Michael Niedermayer 6f9ae391de faxcompr: Dont read ref when the end has been reached in pass mode 
Fixes reading over the end

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 22:55:44 +01:00
Michael Niedermayer 1ac0fa50ef pngdec/filter: dont access out of array elements at the end 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 20:10:35 +01:00
Justin Ruggles 157542ebc1 lavr: fix mixing matrix reduction when normalization is disabled 
In some cases when an input contributes fully to the corresponding
output, other inputs may also contribute to the same output. This is the
case, for example, for the default 5.1 to stereo downmix matrix without
normalization.
 2013-02-12 13:41:13 -05:00
Justin Ruggles 600b4c973f lavr: fix matrix reduction for upmixing in certain cases 
Do not skip an output if the corresponding input contributes to other output
channels.
 2013-02-12 13:41:13 -05:00
Justin Ruggles a3735bb92a lavr: cosmetics: reindent 2013-02-12 13:41:13 -05:00
Justin Ruggles 1647da89dd lavr: make sure that the mix function is reset even if no mixing will be done 
If the matrix reduction ends up with no mixing matrix needed, we need to still
reset the mix function accordingly and log the info to the user.
 2013-02-12 13:41:09 -05:00
Justin Ruggles 646831e697 lavr: print out the mix matrix in ff_audio_mix_set_matrix() 
This will print the new matrix if it is set after initialization.
 2013-02-12 13:35:04 -05:00
Justin Ruggles 205a95f7b5 wmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContext 2013-02-12 12:22:40 -05:00
Justin Ruggles 8ae50d87e7 ws-snd1: decode directly to the user-provided AVFrame 2013-02-12 12:22:40 -05:00
Justin Ruggles c815ca3641 wma: decode directly to the user-provided AVFrame 2013-02-12 12:22:40 -05:00
Justin Ruggles 5a7288822f wmavoice: decode directly to the user-provided AVFrame 2013-02-12 12:22:40 -05:00
Justin Ruggles ee6ca11b65 vorbis: decode directly to the user-provided AVFrame 2013-02-12 12:22:39 -05:00
Justin Ruggles 4a2b26fc1b tak: decode directly to the user-provided AVFrame 2013-02-12 12:22:39 -05:00
Justin Ruggles f4a283eec4 wmapro: decode directly to the user-provided AVFrame 2013-02-12 12:22:39 -05:00
Justin Ruggles f80f8dd4c2 vmdaudio: decode directly to the user-provided AVFrame 2013-02-12 12:22:39 -05:00