xaymar/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,902 Commits 35 Branches 386 Tags
08059f6150fcf75d884670cdbdbdf8830fa199bd
Commit Graph

22749 Commits

Author SHA1 Message Date
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
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 5d5c248c3d s302m: decode directly to the user-provided AVFrame 2013-02-12 12:22:38 -05:00
Justin Ruggles 79fb2a1f17 ra288: decode directly to the user-provided AVFrame 2013-02-12 12:22:38 -05:00
Justin Ruggles 1b9b6d6e5e qcelp: decode directly to the user-provided AVFrame 2013-02-12 12:21:23 -05:00
Justin Ruggles 86bfcfcf23 mace: decode directly to the user-provided AVFrame 2013-02-12 12:21:23 -05:00
Justin Ruggles f7e8c87c02 ra144: decode directly to the user-provided AVFrame 2013-02-12 12:21:23 -05:00
Justin Ruggles 0905c96390 pcm-bluray: decode directly to the user-provided AVFrame 2013-02-12 12:21:23 -05:00
Justin Ruggles cbeb3ed38d ralf: decode directly to the user-provided AVFrame 2013-02-12 12:21:23 -05:00
Justin Ruggles 0fe4056f95 nellymoser: decode directly to the user-provided AVFrame 2013-02-12 12:21:23 -05:00
Justin Ruggles e01e1a4673 qdm2: decode directly to the user-provided AVFrame 2013-02-12 12:21:23 -05:00
Justin Ruggles 3a23752c5a mpc7/8: decode directly to the user-provided AVFrame 2013-02-12 12:21:23 -05:00
Justin Ruggles 2c785e250a mpegaudio: decode directly to the user-provided AVFrame 2013-02-12 12:21:23 -05:00
Justin Ruggles dc33fbbfd0 mlp/truehd: decode directly to the user-provided AVFrame 2013-02-12 12:21:23 -05:00
Justin Ruggles a8ea936a0a libilbc: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles cb7b47a61d g726: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles 182821cff4 dca: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles bed957bb11 libspeex: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles b878867128 dpcm: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles 7e52fd6bca g723.1: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles 7b78321597 cook: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles 19b2cb268f libopus: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles 9b28e58357 imc/iac: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles 036e9b045f g722: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles 0cd08367dd libopencore-amr: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles 6fdfdb23d3 gsm: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles b8e9c99ef1 flac: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles 4f69612d3e libgsm: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles 97c7bdc6d4 cinaudio: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles 5cc0bd2cb4 binkaudio: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles e3db34291f amrnb: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles e57daa876b adpcm: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles cddf8998f1 comfortnoise: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles 9a75ace2b2 atrac3: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles 9b0b355e97 als: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles 55d2e12aef ac3: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles e42e5a89d6 bmvaudio: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles 0ded61b57a atrac1: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles 5cd597f22f alac: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00