virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
50,118 Commits 39 Branches 425 Tags
dd3732634528a51ac8a41528ddd7447073fc049b
Commit Graph
50118 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 VerkampandMichael Niedermayer 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
Justin Ruggles 903b62cc0b smackaud: decode directly to the user-provided AVFrame 2013-02-12 12:22:39 -05:00
Justin Ruggles 9873d71f31 wavpack: decode directly to the user-provided AVFrame 2013-02-12 12:22:39 -05:00
Justin Ruggles 3b7d43383f twinvq: decode directly to the user-provided AVFrame 2013-02-12 12:22:39 -05:00
Justin Ruggles 09d6831f49 sipr: decode directly to the user-provided AVFrame 2013-02-12 12:22:39 -05:00
Justin Ruggles ad2104ba44 tta: decode directly to the user-provided AVFrame 2013-02-12 12:22:39 -05:00
Justin Ruggles 3997fef952 truespeech: decode directly to the user-provided AVFrame 2013-02-12 12:22:39 -05:00
Justin Ruggles 5d5c248c3d s302m: decode directly to the user-provided AVFrame 2013-02-12 12:22:38 -05:00
Justin Ruggles fed74c0ae4 shorten: 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