FFmpeg

Commit Graph

Author	SHA1	Message	Date
Michael Niedermayer	dff4aa6afd	Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104' * commit 'efcde917af407a6031ecff68edd51fce7b83d104': vorbiscomment: simplify API by using av_dict_count() Conflicts: libavformat/flacenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	579e2b2874	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f' * commit '23f741f79327e31be7b2a75ebb2e02111e06e52f': matroskadec: parse the channel layout mask for FLAC Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	1c0ce2d4e0	Merge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0' * commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0': matroskadec: export just the STREAMINFO block as FLAC extradata Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	69de229bb8	Merge commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c' * commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c': matroskadec: split parsing tracks into a separate function Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	40beec6a43	Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0' * commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0': flac: make avpriv_flac_parse_block_header() inline Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	61301ca786	Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c' * commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c': flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files Conflicts: libavformat/flacenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	03ffaed3f0	Merge commit 'd6b9ce99ea384fb676561461768b8316725a4ccd' * commit 'd6b9ce99ea384fb676561461768b8316725a4ccd': flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	ef13967e60	Merge commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362' * commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362': flacdec: do not overwrite a channel layout set by the caller Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Anton Khirnov	efcde917af	vorbiscomment: simplify API by using av_dict_count()	11 years ago
Anton Khirnov	23f741f793	matroskadec: parse the channel layout mask for FLAC It is commonly stored in a vorbiscomment block in codec private data.	11 years ago
Anton Khirnov	4efdadc8ec	matroskadec: export just the STREAMINFO block as FLAC extradata It contains all information that is used by the decoder and the other FLAC-capable demuxers (flacdec, ogg) export only STREAMINFO as well.	11 years ago
Anton Khirnov	6df478bf89	matroskadec: split parsing tracks into a separate function	11 years ago
Anton Khirnov	5fdaf312c5	flac: make avpriv_flac_parse_block_header() inline This avoids all the ABI troubles associated with avpriv_. Since this function is very small and does not depend on any tables, making it inline should have no adverse effects.	11 years ago
Anton Khirnov	54ed488b1a	flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files	11 years ago
Anton Khirnov	d6b9ce99ea	flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag It is used to store the channel mask for non-standard layouts.	11 years ago
Anton Khirnov	f13ffb6636	flacdec: do not overwrite a channel layout set by the caller The channel layout mask for non-standard layouts is typically stored at the container level (as a vorbiscomment tag) for FLAC.	11 years ago
Lukasz Marek	8518da23f5	ffmpeg: add -devices param FFmpeg mix devices and file formats when -formats option is used. This commit adds a -devices param to list devices only. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Lazaros Koromilas	bbc10a1aa5	libavformat/utils: Fix segfault on m4a cover artwork parsing Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Thierry Foucu	12875df324	Timecode: Support 48fps Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	919c320f72	avformat/oggenc: fix EOS flag This corrects the bug that caused the checksums to change in `9767d7c092` Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	b5657516b2	Merge commit '9767d7c092c890ecc5953452e8a951fd902dd67b' * commit '9767d7c092c890ecc5953452e8a951fd902dd67b': oggenc: Flush after writing headers Conflicts: tests/ref/lavf/ogg Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	5313d60dc0	Merge commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1' * commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1': oggenc: Move ogg_write_pages up above ogg_write_header Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	48a6916308	Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c' * commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c': dsputil: Split off HuffYUV encoding bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/huffyuv.h libavcodec/huffyuvenc.c libavcodec/pngenc.c libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	e2abc0d5ca	Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d' * commit '0d439fbede03854eac8a978cccf21a3425a3c82d': dsputil: Split off HuffYUV decoding bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/huffyuv.h libavcodec/huffyuvdec.c libavcodec/lagarith.c libavcodec/vble.c libavcodec/x86/Makefile libavcodec/x86/dsputil.asm libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	43c57dbe14	Merge commit '888dcd86755d37e55fd74166f6d38ad66d41db58' * commit '888dcd86755d37e55fd74166f6d38ad66d41db58': h264_picture: Remove pointless dsputil.h #include Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	d84286b1ea	Merge commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0' * commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0': on2avc: Remove pointless dsputil.h #include Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	5be8c27694	avformat/rtspdec: Use av_mallocz_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	2870617853	avcodec/vp3: use av_mallocz_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	0674da997a	avcodec/cavs: use av_mallocz_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Lou Logan	8a64ea768b	doc/filters: amix only supports float samples Signed-off-by: Lou Logan <lou@lrcd.com>	11 years ago
Andrew Kelley	9767d7c092	oggenc: Flush after writing headers Before, header information for ogg format files was sent with the first encoded packet. This patch makes it so that it is possible for API users to differentiate between headers and encoded audio. This is useful, for example, when creating an audio stream where you want to send one set of headers for every client that connects and then the encoded stream of audio. Signed-off-by: Martin Storsjö <martin@martin.st>	11 years ago
Andrew Kelley	1d3eb0b573	oggenc: Move ogg_write_pages up above ogg_write_header Signed-off-by: Martin Storsjö <martin@martin.st>	11 years ago
Michael Niedermayer	1853e2cba9	avfilter/formats: Avoid using non public AV_SAMPLE_FMT_NB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Diego Biurrun	512f3ffe9b	dsputil: Split off HuffYUV encoding bits into their own context Also shorten HuffYUV context member names to avoid clutter.	11 years ago
Diego Biurrun	0d439fbede	dsputil: Split off HuffYUV decoding bits into their own context Also shorten HuffYUV context member names to avoid clutter.	11 years ago
Michael Niedermayer	0d26264fb4	avfilter/vf_drawtext: Avoid using non public AV_PIX_FMT_NB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	ee0c91cc65	avfilter/vf_telecine: Avoid using non public AV_PIX_FMT_NB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	515e8aed03	avfilter/vf_transpose: Avoid using non public AV_PIX_FMT_NB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	e10ac3a12e	avfilter/vf_swapuv: Avoid using non public AV_PIX_FMT_NB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	cfa0ad6eec	avfilter/vf_noise: Avoid using non public AV_PIX_FMT_NB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	1dbc98461b	avfilter/vf_mergeplanes: Avoid using non public AV_PIX_FMT_NB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	c0f8801e47	avfilter/il: Avoid using non public AV_PIX_FMT_NB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	5feac96fdb	avfilter/hflip: Avoid using non public AV_PIX_FMT_NB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	f3fdc32e2f	avfilter/crop: Avoid using non public AV_PIX_FMT_NB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	64fb19cc99	avfilter/formats: Avoid using non public AV_PIX_FMT_NB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Andreas Cadhalpun	0f17bc644c	Improve the detection of architecture x86. This fixes building on Debian GNU/Hurd. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
James Almer	5863207086	x86/dsputilenc: use HADDD in ff_sse16_sse2 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Diego Biurrun	888dcd8675	h264_picture: Remove pointless dsputil.h #include	11 years ago
Diego Biurrun	f1df0a4c08	on2avc: Remove pointless dsputil.h #include	11 years ago
James Almer	e64e079ece	x86/dsputilenc: implement SSE2 version of diff_pixels Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago

1 2 3 4 5 ...

63518 Commits (dff4aa6afd40bcc6c71b5a21d229fb941f9fc1eb) All Branches Search

63518 Commits (dff4aa6afd40bcc6c71b5a21d229fb941f9fc1eb)

All Branches