FFmpeg

Commit Graph

Author	SHA1	Message	Date
Clément Bœsch	aef2d3d2b5	lavc: fix previous merge	9 years ago
Clément Bœsch	bcafc41a5a	Merge commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c' * commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c': Move VLC and RL_VLC_ELEM structure definitions to a separate header Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Hendrik Leppkes	e799e2270c	Merge commit 'b23613268c6b56a8f9de7859562d82b4b88353d9' * commit 'b23613268c6b56a8f9de7859562d82b4b88353d9': avconv_dxva2: use the hwcontext API Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>	9 years ago
Hendrik Leppkes	0c312a4562	hwcontext_dxva2: support P010 10-bit surfaces	9 years ago
Petru Rares Sincraian	610c0770e3	fate: add test for amerge Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Hendrik Leppkes	3689efea3d	Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8' * commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8': hwcontext: add a dxva2 implementation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>	9 years ago
Michael Niedermayer	d0b21b28a3	avformat/flacdec: Fix seeking close to EOF Fixes Ticket5428 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Michael Niedermayer	b0b3676e13	avcodec/flac_parser: Raise threshold for detecting invalid data Fixes regression from Ticket5428 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Clément Bœsch	6c98398b0b	lavc/get_bits: add a logging context to check_marker() Based on `d338abb664`	9 years ago
Clément Bœsch	7475a9351f	Merge commit 'd338abb664febbc2c7266af7818aab1f12dbc161' * commit 'd338abb664febbc2c7266af7818aab1f12dbc161': mpeg4videodec: Call av_log() in check_marker() with AVCodecContext instead of NULL This commit is a noop. Since check_marker() is still in get_bits.h in FFmpeg and shared amongst decoders, a similar but different change will be committed in the next commit in to serve the same purpose of this one (that is, passing a logging context to the av_log() in that function). Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	575be7311c	Merge commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834' * commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834': Move check_marker() from get_bits to mpeg4videodec Not merged, check_marker() is used in various other places in FFmpeg. Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	541e1c2c3b	Merge commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3' * commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3': lavc: mark the old audio/video encoding API as deprecated Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	93f5a27313	Merge commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c' * commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c': x86inc: Enable AVX emulation in additional cases This commit is a noop, see `e428f3b30c` Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	1c85027afe	Merge commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600' * commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600': x86inc: Improve handling of %ifid with multi-token parameters This commit is a noop, see `4bd5583ace` Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	3d1b9383b7	Merge commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f' * commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f': x86inc: Fix AVX emulation of some instructions This commit is a noop, see `42be240ad6` Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	a24cbbbfc4	Merge commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc' * commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc': x86inc: Fix AVX emulation of scalar float instructions This commit is a noop, see `8dd3ee9ddd` Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	17fdffc9f8	Merge commit '8996515b137f962e3a8691241c285c96437b6c53' * commit '8996515b137f962e3a8691241c285c96437b6c53': avpacket: fix setting AVPacket.data in av_packet_ref() This commit is a noop, see `ed3a02547c` Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	d4b1b3b06c	Merge commit 'e62ff72fc1052273deb708ba715f73e5187281d4' * commit 'e62ff72fc1052273deb708ba715f73e5187281d4': lavc: make avcodec_open2() fail when the timebase is not set for encoding Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Michael Niedermayer	70d48accd8	avcodec/tests/options: Set timebase Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Clément Bœsch	a444a50510	Merge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f' * commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f': Combine deprecation guards where appropriate Merged-by: Clément Bœsch <clement@stupeflix.com>	9 years ago
Clément Bœsch	48ac4532d4	lavf/img2dec: add pnm pipe demuxers	9 years ago
Michael Niedermayer	99c3c3237b	avformat/utils: Use internal->avctx for bitrate in estimate_timings_from_bit_rate() if needed The internal avctx bitrate is copied into codecpar after estimate_timings() Fixes Ticket5646 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Michael Niedermayer	4fecb97fd3	avformat/utils: change bit_rate to 64 bit in estimate_timings_from_bit_rate() Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Clément Bœsch	a9eda4b260	swr: fix time.h include	9 years ago
Clément Bœsch	5d48e4eafa	Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' * commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196': tests: Move all test programs to a subdirectory Merged-by: Clément Bœsch <clement@stupeflix.com>	9 years ago
Michael Bradshaw	989a614b70	libavformat/matroskaenc: omit segment UID for webm SegmentUID is not a supported element in WebM. See: http://www.webmproject.org/docs/container/#SegmentUID Reviewed-by: Dave Rice <dave@dericed.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Clément Bœsch	5558ff3a9f	Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801' * commit '257f00ec1ab06a2a161f535036c6512f3fc8e801': Split global .gitignore file into per-directory files Merged-by: Clément Bœsch <clement@stupeflix.com>	9 years ago
Clément Bœsch	85185578ce	lavc/qtrleenc: simplify FF_API_CODED_FRAME deprecation guard	9 years ago
Clément Bœsch	0491d6993a	lavc/error_resilience: remove unused skip_last_mv label Unused since `a7b8a6e704`	9 years ago
Clément Bœsch	e6247a22c0	Merge commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b' * commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b': Add some more deprecation guards - psnr() deprecation is not merged within ffmpeg.c as we still use it in non-deprecated code - the XVMC chunk is not merged as we still apparently maintain it - The guarding in lavc/qtrleenc.c could be simplified but merged anyway. Merged-by: Clément Bœsch <clement@stupeflix.com>	9 years ago
Matthieu Bouron	df3484f87c	lavc/videotoolbox: fix avcC extradata creation Fixes properly ticket #5638. Since `772ad7142d` PPS and SPS contain the nal type byte. This reverts commit `b8d754c5d0`. This reverts commit `8e47a99f57`.	9 years ago
Michael Niedermayer	e0faad837c	avformat/flvdec: Do not check last size if it could not be read due to EOF Fixes part of Ticket5648 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Michael Niedermayer	3f380b9b40	avformat/flvdec: Also print sum_flv_tag_size on size mismatches Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Michael Niedermayer	e8931d79cc	avformat/flvdec: Accept last size if its off by 1 Fixes part of Ticket5648 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Clément Bœsch	a4403e49b9	Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376' * commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376': Reduce the scope of some variables Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	00e122bc0f	Merge commit 'bc2a32969eb4db17677971def5ad5b936d9d1648' * commit 'bc2a32969eb4db17677971def5ad5b936d9d1648': rtsp: Parse SSRC attributes in the SDP Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	4873952f88	Merge commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a' * commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a': rtpdec: Always check if we have the next packet queued Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	91450cda2e	Merge commit '0c1d66a07917602303f129f5a5651faeec2415d5' * commit '0c1d66a07917602303f129f5a5651faeec2415d5': avconv_vaapi: fix double-free with some unsupported streams Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	475a686a01	Merge commit '885a9d6087315a85d98f7e89656ef01dc7104c4c' * commit '885a9d6087315a85d98f7e89656ef01dc7104c4c': pgssub: Fix subpicture colorspace and range See `9779b62624` Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	e4c07dc4b7	Merge commit '1f77e634bb838f71ff21923b5e9fe3104c831c52' * commit '1f77e634bb838f71ff21923b5e9fe3104c831c52': colorspace: Add support for BT709 See `9779b62624` Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	363d4a0e65	Merge commit '283226e11ccf50a71d25d150fbbf1743f74c6c49' * commit '283226e11ccf50a71d25d150fbbf1743f74c6c49': simple_idct_template: Fix strict aliasing violation See `5df703aa1b` Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	e276f21f99	Merge commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92' * commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92': avio: Remove a leftover comment Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	8df1dbd798	Merge commit '5afb94c817abffad030c6b94d7003dca8aace3d5' * commit '5afb94c817abffad030c6b94d7003dca8aace3d5': Mark read-only tables as static Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	ea80e90e13	Merge commit '1f1ad8ace040a08edc2646ff638ca42a8828779f' * commit '1f1ad8ace040a08edc2646ff638ca42a8828779f': configure: Document --enable-libfontconfig Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	d0d9dbec2f	Merge commit 'def03d14687b9d089950ba8e45083e666de4eb68' * commit 'def03d14687b9d089950ba8e45083e666de4eb68': vf_frei0r: Drop overly verbose and broken debug output Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Clément Bœsch	8ef57a0d61	Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>	9 years ago
Aman Gupta	373b82066c	avformat/mpegts: include stream type for aac this removes the need to probe to discover aac streams inside mpegts containers, thus speeding up initial playback. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Clément Bœsch	9204a84998	Merge commit '5c31eaa9998b2185e0aa04d11adff128498dc14a' * commit '5c31eaa9998b2185e0aa04d11adff128498dc14a': Remove unnecessary get_bits.h #includes and add missing headers where needed. Merged-by: Clément Bœsch <clement@stupeflix.com>	9 years ago
Clément Bœsch	3801060cd0	Merge commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f' * commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f': h264: Drop broken trace debug output This commit is not merged as the debug was fixed in `94011f994a`. Merged-by: Clément Bœsch <clement@stupeflix.com>	9 years ago
Clément Bœsch	d12cce3fb2	Merge commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6' * commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6': vaapi: Drop pointless debug output Merged-by: Clément Bœsch <clement@stupeflix.com>	9 years ago

1 2 3 4 5 ...

80570 Commits (aef2d3d2b5f9eb33cdf1a4f7b8a2fd83f393d665) All Branches Search

80570 Commits (aef2d3d2b5f9eb33cdf1a4f7b8a2fd83f393d665)

All Branches