]>
git.sesse.net Git - ffmpeg/log
Justin Ruggles [Fri, 18 Jan 2013 18:27:50 +0000 (13:27 -0500)]
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.
Justin Ruggles [Fri, 18 Jan 2013 18:25:19 +0000 (13:25 -0500)]
lavr: print out the mix matrix in ff_audio_mix_set_matrix()
This will print the new matrix if it is set after initialization.
Justin Ruggles [Mon, 24 Dec 2012 01:26:15 +0000 (20:26 -0500)]
wmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContext
Justin Ruggles [Mon, 24 Dec 2012 01:31:24 +0000 (20:31 -0500)]
ws-snd1: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:25:52 +0000 (20:25 -0500)]
wma: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:29:44 +0000 (20:29 -0500)]
wmavoice: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:11:36 +0000 (20:11 -0500)]
vorbis: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:02:46 +0000 (20:02 -0500)]
tak: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:16:21 +0000 (20:16 -0500)]
wmapro: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:10:01 +0000 (20:10 -0500)]
vmdaudio: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:00:41 +0000 (20:00 -0500)]
smackaud: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:13:08 +0000 (20:13 -0500)]
wavpack: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:08:05 +0000 (20:08 -0500)]
twinvq: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:58:35 +0000 (19:58 -0500)]
sipr: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:06:41 +0000 (20:06 -0500)]
tta: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:04:31 +0000 (20:04 -0500)]
truespeech: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:54:24 +0000 (19:54 -0500)]
s302m: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:56:32 +0000 (19:56 -0500)]
shorten: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:52:00 +0000 (19:52 -0500)]
ra288: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:43:11 +0000 (19:43 -0500)]
qcelp: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:22:07 +0000 (19:22 -0500)]
mace: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:50:54 +0000 (19:50 -0500)]
ra144: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:41:46 +0000 (19:41 -0500)]
pcm-bluray: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:49:38 +0000 (19:49 -0500)]
ralf: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:39:44 +0000 (19:39 -0500)]
nellymoser: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:46:58 +0000 (19:46 -0500)]
qdm2: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:38:34 +0000 (19:38 -0500)]
mpc7/8: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:34:54 +0000 (19:34 -0500)]
mpegaudio: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:24:24 +0000 (19:24 -0500)]
mlp/truehd: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 23:05:53 +0000 (18:05 -0500)]
libilbc: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:56:53 +0000 (17:56 -0500)]
g726: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:43:47 +0000 (17:43 -0500)]
dca: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:19:25 +0000 (19:19 -0500)]
libspeex: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 23:03:43 +0000 (18:03 -0500)]
dpcm: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:55:09 +0000 (17:55 -0500)]
g723.1: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:41:31 +0000 (17:41 -0500)]
cook: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 23:45:55 +0000 (18:45 -0500)]
libopus: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 23:01:45 +0000 (18:01 -0500)]
imc/iac: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:53:06 +0000 (17:53 -0500)]
g722: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 23:42:58 +0000 (18:42 -0500)]
libopencore-amr: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 23:00:01 +0000 (18:00 -0500)]
gsm: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:49:27 +0000 (17:49 -0500)]
flac: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 23:40:50 +0000 (18:40 -0500)]
libgsm: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:47:02 +0000 (17:47 -0500)]
cinaudio: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:26:26 +0000 (17:26 -0500)]
binkaudio: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:01:33 +0000 (17:01 -0500)]
amrnb: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 21:43:07 +0000 (16:43 -0500)]
adpcm: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:37:34 +0000 (17:37 -0500)]
comfortnoise: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:24:53 +0000 (17:24 -0500)]
atrac3: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 21:59:43 +0000 (16:59 -0500)]
als: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 21:40:37 +0000 (16:40 -0500)]
ac3: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:35:54 +0000 (17:35 -0500)]
bmvaudio: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:07:10 +0000 (17:07 -0500)]
atrac1: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 21:56:17 +0000 (16:56 -0500)]
alac: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 21:37:23 +0000 (16:37 -0500)]
aac: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:10:12 +0000 (17:10 -0500)]
pcm: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:05:40 +0000 (17:05 -0500)]
ape: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 21:51:41 +0000 (16:51 -0500)]
adxenc: alloc/free coded_frame instead of keeping it in the ADXContext
Justin Ruggles [Sun, 23 Dec 2012 21:28:03 +0000 (16:28 -0500)]
8svx: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 22:03:36 +0000 (17:03 -0500)]
amrwb: decode directly to the user-provided AVFrame
Justin Ruggles [Sun, 23 Dec 2012 21:50:06 +0000 (16:50 -0500)]
adx: decode directly to the user-provided AVFrame
Daniel Verkamp [Wed, 23 Jan 2013 08:30:23 +0000 (01:30 -0700)]
WAV muxer: add RF64 support
James Almer [Wed, 30 Jan 2013 03:35:26 +0000 (00:35 -0300)]
lavc/tta: Add support for encrypted streams
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Feb 2013 13:10:36 +0000 (14:10 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavu: avoid clashing definition of E
doc: developer: Add a note about reserved system name space
Conflicts:
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Feb 2013 12:41:24 +0000 (13:41 +0100)]
Merge commit '
56dea32f09e71460add14a1b6d0fbe6eb16f02a4 '
* commit '
56dea32f09e71460add14a1b6d0fbe6eb16f02a4 ':
doc: developer: Fix wording in "naming conventions" section
openbsd: Add minor number to shared library install name
Conflicts:
doc/developer.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Feb 2013 12:26:15 +0000 (13:26 +0100)]
Merge commit '
304b806cb524fb040f8e09a241040f1af2cb820b '
* commit '
304b806cb524fb040f8e09a241040f1af2cb820b ':
build: Make library minor version visible in the Makefile
x86: mpeg4qpel: Make movsxifnidn do the right thing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Feb 2013 12:13:36 +0000 (13:13 +0100)]
Merge commit '
4c51fe48ba6dde059360b7451db7f6bbf2f11db3 '
* commit '
4c51fe48ba6dde059360b7451db7f6bbf2f11db3 ':
h264: Copy h264chroma dsp context to slice thread copies
swscale: Disallow conversion to GBRP16
Conflicts:
libswscale/utils.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Feb 2013 11:58:10 +0000 (12:58 +0100)]
Merge commit '
62a43d30cc3b9b2460f2c926beb522df32493625 '
* commit '
62a43d30cc3b9b2460f2c926beb522df32493625 ':
crc: Move static data table from header to .c file
avcodec/rectangle: Remove nonsense assert
Conflicts:
libavcodec/rectangle.h
libavutil/crc_data.h
The assert is not removed as the assert ensures clear and easy
to debug failures instead of undefined behavior in case of
misalignment.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Feb 2013 11:40:57 +0000 (12:40 +0100)]
Merge commit '
375ef6528c9dd2db7f9881e232cb0ec3aa16970d '
* commit '
375ef6528c9dd2db7f9881e232cb0ec3aa16970d ':
libfdk-aacenc: Actually check for upper bounds of cutoff
arm: Fall back to runtime cpu feature detection via /proc/cpuinfo
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 9 Feb 2013 21:37:07 +0000 (22:37 +0100)]
lavu: avoid clashing definition of E
E is usually defined as a shorthand for AV_OPT_FLAG_ENCODING_PARAM.
Rename the single expansion E(x) now used in libavutil to E1.
Ronald S. Bultje [Tue, 12 Feb 2013 01:04:27 +0000 (17:04 -0800)]
Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil.
These functions are mostly H264-specific (the only other user I can
spot is bink), and this allows us to special-case some functionality
for H264. Also remove the 16-bit-coeff with >8bpp versions (unused)
and merge the duplicate 32-bit-coeff for >8bpp (identical).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Feb 2013 01:03:28 +0000 (02:03 +0100)]
sanm: Use the correct height variable in the decoded_size checks
Fixes integer overflow and out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Feb 2013 01:00:04 +0000 (02:00 +0100)]
sanm: init sizes with the full frame size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Feb 2013 00:59:07 +0000 (01:59 +0100)]
sanm: reset frame sizes on buffer destruction
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Feb 2013 00:09:03 +0000 (01:09 +0100)]
sanm: add forgotten check for decoded_size in old_codec37()
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Feb 2013 23:32:16 +0000 (00:32 +0100)]
ffmpeg: fix streamcopy of lsf mp3.
Fixes streamcopy of bear_mpeg4_mp3.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 11 Feb 2013 22:40:41 +0000 (23:40 +0100)]
doc/filters: rework idet filter description
Stefano Sabatini [Mon, 11 Feb 2013 22:38:47 +0000 (23:38 +0100)]
doc/filters: apply minor fixes to il filter docs
Stefano Sabatini [Mon, 11 Feb 2013 22:37:53 +0000 (23:37 +0100)]
doc/filters: fix position of il filter docs
Ronald S. Bultje [Tue, 29 Jan 2013 23:55:19 +0000 (15:55 -0800)]
Use simple nop codes for <= sse (rather than <= mmx).
The "CPU: CentaurHauls family 6 model 9 stepping 8" family of CPUs
(flags: fpu vme de pse tsc msr cx8 sep mtrr pge mov pat mmx fxsr sse
up rng rng_en ace ace_en) SIGILLs on long nop codes.
Change-Id: I7e7c52a2191006df30a9aadbc40d481a1db89106
Ronald S. Bultje [Mon, 11 Feb 2013 21:52:38 +0000 (13:52 -0800)]
h264chroma: remove duplicate 9/10 bit functions.
Also use the resulting 16bpp functions for anything >8 and <=16, not just
9 and 10. This fixes 12 and 14bpp H264 support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 11 Feb 2013 17:39:12 +0000 (18:39 +0100)]
doc: developer: Fix wording in "naming conventions" section
Diego Biurrun [Sun, 3 Feb 2013 14:03:08 +0000 (15:03 +0100)]
build: Make library minor version visible in the Makefile
This allows employing that number in library install commands.
Diego Biurrun [Mon, 11 Feb 2013 17:53:33 +0000 (18:53 +0100)]
doc: developer: Add a note about reserved system name space
Diego Biurrun [Sun, 3 Feb 2013 14:02:31 +0000 (15:02 +0100)]
openbsd: Add minor number to shared library install name
This is what the OpenBSD porter's manual describes as correct, cf.
http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs
Daniel Kang [Mon, 11 Feb 2013 18:45:10 +0000 (13:45 -0500)]
x86: mpeg4qpel: Make movsxifnidn do the right thing
Fixes an instruction that does nothing by changing the
source to dword.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Martin Storsjö [Mon, 11 Feb 2013 18:27:50 +0000 (20:27 +0200)]
h264: Copy h264chroma dsp context to slice thread copies
This fixes slice threading which seems to have been broken since
79dad2a93 .
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 4 Feb 2013 16:33:07 +0000 (17:33 +0100)]
ffv1enc: better heuristic to calculate initial states
Slightly improves compression of 2pass files
Tested-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 11 Feb 2013 11:37:29 +0000 (13:37 +0200)]
swscale: Disallow conversion to GBRP16
This reverts parts of
d6d5ef5534d582 , that didn't work right. (The
tests that were added failed on big endian, and the output looked
garbled on little endian as well.)
This is due to the fact that the intermediate scaling values (from
e.g. hScale8To19_c or hScale16To19_c) are stored as int32_t and
thus requires a separate output function, while yuv2gbrp_full_X_c
only interprets it as int16_t.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Sun, 3 Feb 2013 14:43:47 +0000 (15:43 +0100)]
crc: Move static data table from header to .c file
Having static data tables in header files is a potential source of trouble.
Diego Biurrun [Fri, 8 Feb 2013 14:55:24 +0000 (15:55 +0100)]
avcodec/rectangle: Remove nonsense assert
Derek Buitenhuis [Sat, 9 Feb 2013 19:03:02 +0000 (14:03 -0500)]
libfdk-aacenc: Actually check for upper bounds of cutoff
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sat, 9 Feb 2013 19:03:02 +0000 (14:03 -0500)]
libfdk-aacenc: Actually check for upper bounds of cutoff
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Martin Storsjö [Thu, 7 Feb 2013 08:54:20 +0000 (10:54 +0200)]
arm: Fall back to runtime cpu feature detection via /proc/cpuinfo
On recent android versions, /proc/self/auxw is unreadable
(unless the process is running running under the shell uid or
in debuggable mode, which makes it hard to notice). See
http://b.android.com/43055 and
https://android-review.googlesource.com/51271 for more information
about the issue.
This makes sure e.g. neon optimizations are enabled at runtime in
android apps even when built in release mode, if configured to
use the runtime detection.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Mon, 11 Feb 2013 12:47:02 +0000 (12:47 +0000)]
lavfi/amerge: make description consistent with documentation
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Mon, 11 Feb 2013 12:11:16 +0000 (13:11 +0100)]
Print mxf Universal Label if the user requested verbose logging.
Fixes ticket #2198
Michael Niedermayer [Mon, 11 Feb 2013 11:15:54 +0000 (12:15 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sparc: dsputil_vis: Fix silly variable name search and replace typo
Conflicts:
libavcodec/sparc/dsputil_vis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 11 Feb 2013 11:04:52 +0000 (11:04 +0000)]
evrcdec: fix wrong condition
Fixes CID980005 and CID980004.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Ronald S. Bultje [Mon, 11 Feb 2013 00:46:07 +0000 (16:46 -0800)]
get_bits: return pointer to buffer that is the result of the alignment.
This allows more transparent mixing of get_bits and whole-byte access
without having to touch get_bits internals.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 10 Feb 2013 23:59:22 +0000 (15:59 -0800)]
bit_depth_template: don't depend on dsputil.h.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>