FFmpeg

Commit Graph

Author	SHA1	Message	Date
Michael Niedermayer	47550e62bf	avformat/astenc: avoid using AVCodecContext.frame_number Theres no gurantee that the user application has initialized it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	ba040d4c8c	Merge commit '3828eb8519c1530392ab8820b1aa784602128afc' * commit '3828eb8519c1530392ab8820b1aa784602128afc': libfdk-aac: Relicense the library wrappers to 2-clause BSD Conflicts: libavcodec/libfdk-aacdec.c libavcodec/libfdk-aacenc.c <Daemon404> michaelni, fyi, for the fdk relicensing, wbs also contact all the ffmpeg-only contributers <Daemon404> so it should be fine to merge. Thanks-to: Martin Storsjö <martin@martin.st> Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	db9c138616	Merge commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84' * commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84': libfdk-aacenc: Enable 7.1 channel encoding See: `91489d28ba`, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	d5ec1ddf7b	Merge commit '9580818c5d934bde65a95efd2cee61c174721092' * commit '9580818c5d934bde65a95efd2cee61c174721092': avconv: rename OutputStream.opts to OutputStream.encoder_opts Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	22ffa5390f	Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11' * commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11': avconv: remove a useless line Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	1efc089218	Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d' * commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d': avconv: rename 'codec' to 'enc_ctx' Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	1f40536cca	Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c' * commit '650a5206a944fd36a42d92f98e745972056b1f7c': avconv: rename 'icodec' to 'dec_ctx' Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	42b7bda41a	Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66' * commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66': avconv: rename InputStream.opts to InputStream.decoder_opts Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	6e39707438	Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3' * commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3': avconv: simplify exit_program() by using more local vars Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Martin Storsjö	3828eb8519	libfdk-aac: Relicense the library wrappers to 2-clause BSD This should make it possible for Fraunhofer to contribute to these wrappers - they didn't want to contribute to code under LGPL2.1 with the "or any later version" clause (which allowed using the code under the LGPL3 license). Signed-off-by: Martin Storsjö <martin@martin.st>	11 years ago
Jean First	15fa856b82	libfdk-aacenc: Enable 7.1 channel encoding 7.1(wide) and 7.1(wide-side) channel layouts are supported in fdk-aac since the 0.1.3 release. The earlier versions of fdk-aac didn't include any library version defines in the public headers, thus checking for the AACENCODER_LIB_VL0 define is enough to know that we're building against a new enough version of fdk-aac. This change includes contributions by Tim Walker, Michael Niedermayer and Timothy Gu. Signed-off-by: Martin Storsjö <martin@martin.st>	11 years ago
Carl Eugen Hoyos	db01de4c0a	Fix standalone compilation of sonic lossless encoder.	11 years ago
Michael Niedermayer	6bd1741231	avfilter/f_select: fix incompatible pointer type warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	ebf2c2c3a8	avcodec/lossless_videodsp: fix incompatible pointer type warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Hendrik Leppkes	ae8e2d7634	avisynth: set duration of audio streams Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	656fe7ecce	swscale/utils: use FF_ALLOC(Z)_ARRAY_OR_GOTO() and av_malloc(z)_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	beecfa81ac	avutil/pca: Use av_malloc_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	35e16b1bab	MAINTANERS: update snow/ffv1/nut entries as these are no longer in a single file Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	aeeb3d4605	Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: Map --enable-lto to -ipo when compiling with icc. Disable inline_asm_direct_symbol_refs if lto was requested. Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Carl Eugen Hoyos	431c7bd3f4	Map --enable-lto to -ipo when compiling with icc.	11 years ago
Carl Eugen Hoyos	a64df19c5b	Disable inline_asm_direct_symbol_refs if lto was requested. This fixes link time optimizations with gcc without disabling inline asm. Fixes ticket #2941.	11 years ago
Lukasz Marek	c9a12fdd2d	lavf/mux: pass options to nested structs of priv data This is continuation of commit `330d547e` Nested struct is set in two places. Previous commit set nested struct only in one case. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	336901e060	avcodec/h263dec: use AV_EF_IGNORE_ERR Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	e94b08f002	avformat: add AV_EF_IGNORE_ERR Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	d7ade20adb	avcodec: add AV_EF_IGNORE_ERR Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	928e2a7d64	doc/codecs: document ignore_err Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Clément Bœsch	7c3941b25c	avfilter/lut3d: support 3DLUTSIZE directive for Davinci files. Fixes Ticket #2847.	11 years ago
Lukasz Marek	3316556cf7	MAINTAINERS: add myself as lavd/xv maintainer Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Matt Oliver	c25b0b7788	Maintainers: add myself for msvc and icl. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Matt Oliver	a6b0c0e123	Enable inline asm in intel compiler on windows. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	8b132bb7b9	Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: Initialize riff and wav size fields to -1 instead of 0. Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	32388e04a8	Merge commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510' * commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510': probe: Support AAC_LATM in set_codec_from_probe_data Conflicts: libavformat/utils.c See: `7bdc5de33d` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	4210cbf193	Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5' * commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5': latm: Add a probe function Conflicts: libavformat/rawdec.c See: `47818b2a67` See: `097f668047` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	bc4b424dfa	Merge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f' * commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f': mathematics: K&R formatting cosmetics Conflicts: libavutil/mathematics.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	1c4110be90	Merge commit '3a177a9cca924e097265b32f9282814f6b653e08' * commit '3a177a9cca924e097265b32f9282814f6b653e08': swscale: Fix an undefined behaviour Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	039630631e	Merge commit '925c37874b617816b6f460c6f229c18b46548b46' * commit '925c37874b617816b6f460c6f229c18b46548b46': vp9: Read the frame size as unsigned Conflicts: libavcodec/vp9.c See: `c72f587353` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	0c06ca7a8a	Merge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964' * commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964': aac: K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	3ea5beab8f	Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f' * commit 'c6b42e85493915a3c3891345f57422f9031a0b4f': flv: K&R formatting cosmetics Conflicts: libavcodec/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	0a5cc20d4a	avcodec/jpeglsdec: add cast to silence pointer type warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	6b79ef00fd	avfilter/vf_deshake: dont pass the wrong context into the SAD functions This fixes pointer type warnings The context should have been unused so this should not fix any real bug Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	a520d8fd35	avcodec/snow_dwt: fix "incompatible pointer type" warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Carl Eugen Hoyos	c2b0ce70ad	Initialize riff and wav size fields to -1 instead of 0. WMP doess not play the output files if the fields are set to 0 and not overwritten (using pipe output). Fixes ticket #3346.	11 years ago
Michael Niedermayer	5918c5a4cc	avcodec/kgv1dec: add casts to silence "assignment from incompatible pointer type" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	bb605ef8ab	avcodec/xbmdec: fix pointer type warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Anton Khirnov	9580818c5d	avconv: rename OutputStream.opts to OutputStream.encoder_opts This makes it more clear what is this variable for exactly.	11 years ago
Anton Khirnov	01947f07b8	avconv: remove a useless line Doing anything with that field when we are doing streamcopy (so the encoder is not opened) should have absolutely no effect.	11 years ago
Anton Khirnov	65ed9e7585	avconv: rename 'codec' to 'enc_ctx' This more clearly describes what is the variable used for. Also, move its declaration into the block where it is actually used.	11 years ago
Anton Khirnov	650a5206a9	avconv: rename 'icodec' to 'dec_ctx' This more clearly describes what is the variable used for.	11 years ago
Anton Khirnov	f3a6ad22c9	avconv: rename InputStream.opts to InputStream.decoder_opts This makes it more clear what is this variable for exactly.	11 years ago
Anton Khirnov	73ed8558a6	avconv: simplify exit_program() by using more local vars	11 years ago

... 5 6 7 8 9 ...

63285 Commits (93318983c3e565b3079362ec69cf3362febc5004) All Branches Search

63285 Commits (93318983c3e565b3079362ec69cf3362febc5004)

All Branches