FFmpeg

Commit Graph

Author	SHA1	Message	Date
Michael Niedermayer	1295377f0a	Merge remote-tracking branch 'qatar/master' * qatar/master: rtspenc: Make sure BYE packets are sent before TEARDOWN Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	04894ef32e	Merge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05' * commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05': rtpenc: Add a rtpflag option for sending BYE packets when finishing Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	5a7a56d7be	Merge commit 'b264453de93999ea6f23e98014390af468f56146' * commit 'b264453de93999ea6f23e98014390af468f56146': rtpenc: Remove some superfluous parentheses Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	81c3bb78ac	Merge commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4' * commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4': aviobuf: Handle a NULL buffer in avio_close_dyn_buf Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	382545ae62	Merge commit '28240a60c1b5ce276e947ba013271ec009adc078' * commit '28240a60c1b5ce276e947ba013271ec009adc078': lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	935d0ee08d	Merge commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3' * commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3': lavc: deprecate unused FF_BUG_OLD_MSMPEG4 Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	7592d30bcb	Merge commit '0300962b76644f145b773439989a5cdf1667e162' * commit '0300962b76644f145b773439989a5cdf1667e162': lavc: schedule FF_BUG_AC_VLC for removal on the next major bump. Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	9bcf647867	avcodec: document that FF_DEBUG_VIS_QP / FF_DEBUG_VIS_MB_TYPE should only be used through avoptions This preempts ABI issues if their values get reused by the fork for something unrelated Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	2a2cc0af6d	Merge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8' * commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8': lavc: deprecate FF_DEBUG_VIS_* leave the AVOptions as they work fine Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	f49e6359b6	avcodec/avcodec.h: move debug_mv to the end of the struct with the next ABI bump This maintains ABI compatibility also add a note that debug_mv must be accessed through AVOptions (for ABI) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	66df6f5407	Merge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577' * commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577': lavc: deprecate AVCodecContext.debug_mv Conflicts: libavcodec/options_table.h Not merged, debug_mv works fine Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	c97d397cbb	Merge commit 'fae753af709537fc75ff1c4ce21fc1f4429af929' * commit 'fae753af709537fc75ff1c4ce21fc1f4429af929': avplay: drop -vismv option which does not do anything anymore Conflicts: Changelog ffplay.c Not merged, the vismv option works fine in ffplay Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	c6c03dfdf1	Merge commit 'ccc71298456d97f64f539e303c771d04dcb33c53' * commit 'ccc71298456d97f64f539e303c771d04dcb33c53': lavc: deprecate FF_DEBUG_MV and remove all traces of its use Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	6262763d8d	Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352' * commit 'b6a4701612514c97d22f7ffb37993539f7718352': mpegts: Support HEVC demuxing Conflicts: Changelog libavformat/version.h See: `93c1fe4de3` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	0fbeeb9399	Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075' * commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075': matroskadec: Support HEVC demuxing Conflicts: Changelog libavformat/matroskadec.c libavformat/version.h See: `16b6839de6` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	3a0c902636	Merge commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7' * commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7': mov: Support HEVC demuxing Conflicts: Changelog libavformat/mov.c libavformat/version.h See: `53f903b7c5` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	b594aceb94	Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99' * commit '5846646296e377e093441dfe9eadde38ff1f7c99': Add raw HEVC demuxer Conflicts: Changelog libavformat/hevcdec.c libavformat/version.h See: `902a5fa722` and later commits Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	3552bd9318	Merge commit 'e1c058dba930c1f6f180e04d9e26dbda261cedbc' * commit 'e1c058dba930c1f6f180e04d9e26dbda261cedbc': FATE: Add HEVC tests Conflicts: tests/fate/hevc.mak tests/ref/fate/hevc-conformance-DBLK_A_SONY_3 tests/ref/fate/hevc-conformance-DBLK_B_SONY_3 tests/ref/fate/hevc-conformance-DBLK_C_SONY_3 tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3 tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3 tests/ref/fate/hevc-conformance-POC_A_Bossen_3 tests/ref/fate/hevc-conformance-RPS_D_ericsson_5 tests/ref/fate/hevc-conformance-WP_B_Toshiba_3 tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3 See: `fb3cea4be3` and later commits Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	5eb1704d5f	Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942' * commit '064698d381e1e7790f21b0199a8930ea04e2e942': Add HEVC decoder Conflicts: Changelog libavcodec/Makefile libavcodec/allcodecs.c libavcodec/hevc.c libavcodec/hevc.h libavcodec/hevc_cabac.c libavcodec/hevc_filter.c libavcodec/hevc_mvs.c libavcodec/hevc_parser.c libavcodec/hevc_ps.c libavcodec/hevc_refs.c libavcodec/hevc_sei.c libavcodec/hevcdsp.c libavcodec/hevcdsp_template.c libavcodec/hevcpred.c libavcodec/hevcpred_template.c libavcodec/version.h cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg. Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Lukasz Marek	c617c669e9	lavd/xv: free graphics context Valgrind detects mem leak from XCreateGC. Free it with XFreeGC. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>	11 years ago
Michael Niedermayer	8b2dd04afc	Merge commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb' * commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb': webp: stop using deprecated avcodec_set_dimensions Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	98ca3fb9cf	Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be' * commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be': vp8: stop using deprecated avcodec_set_dimensions vp56: stop using deprecated avcodec_set_dimensions vp3: stop using deprecated avcodec_set_dimensions txd: stop using deprecated avcodec_set_dimensions truemotion1: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/txd.c libavcodec/vp56.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	ffd100b111	Merge commit 'c265b8bb7638546919465e3585441b1d40c4b13d' * commit 'c265b8bb7638546919465e3585441b1d40c4b13d': tiff: stop using deprecated avcodec_set_dimensions targa: stop using deprecated avcodec_set_dimensions svq1dec: stop using deprecated avcodec_set_dimensions sunrast: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/sunrast.c libavcodec/targa.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	7630e564ca	Merge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934' * commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934': sgidec: stop using deprecated avcodec_set_dimensions rv34: stop using deprecated avcodec_set_dimensions rv10: stop using deprecated avcodec_set_dimensions ptx: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/ptx.c libavcodec/rv10.c libavcodec/sgidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	a897ba33e8	Merge commit '0f21d8b1b40848973558c737aebe800c46e93a3d' * commit '0f21d8b1b40848973558c737aebe800c46e93a3d': pictordec: stop using deprecated avcodec_set_dimensions pgssubdec: stop using deprecated avcodec_set_dimensions pcx: stop using deprecated avcodec_set_dimensions mpegvideo_parser: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/pcx.c libavcodec/pgssubdec.c libavcodec/pictordec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	64a0ed190e	Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089' * commit '13207484bba8a8b78b40d5a22da8c9c555429089': mpeg4video_parser: stop using deprecated avcodec_set_dimensions mpeg12dec: stop using deprecated avcodec_set_dimensions mjpegdec: stop using deprecated avcodec_set_dimensions libvpxdec: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4video_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	bf92cd8178	Merge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e' * commit '967cd6fafbf2fdec9cbe011296ad34a70212427e': libopenjpegdec: stop using deprecated avcodec_set_dimensions kgv1dec: stop using deprecated avcodec_set_dimensions ivi_common: stop using deprecated avcodec_set_dimensions indeo3: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/ivi_common.c libavcodec/kgv1dec.c libavcodec/libopenjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	e6b9d71ad9	Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6' * commit '3b086317277e3f3b61c0343930d8e2570b278bd6': h26[13]dec: stop using deprecated avcodec_set_dimensions gifdec: stop using deprecated avcodec_set_dimensions g2meet: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/gifdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	599c285162	avfilter/vf_gradfun: add emms_c() for mmxext Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Clément Bœsch	969329fe11	Revert "Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'" This reverts commit `fc5fe4804f`, reversing changes made to `ffe3350098`. The factoring is broken; it's not calling the ssse3 code anymore, and calling the mmx2 code with bad alignment. It also broke some FATE instances. Conflicts: libavfilter/x86/vf_gradfun_init.c	11 years ago
Michael Niedermayer	c6125f5e1c	avfilter/x86/vf_gradfun_init: fix some consts & related warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	bf688d23b5	Merge commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8' * commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8': eatqi: stop using deprecated avcodec_set_dimensions eatgv: stop using deprecated avcodec_set_dimensions eatgq: stop using deprecated avcodec_set_dimensions eamad: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/eamad.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	4a35651267	Merge commit 'd6da372984c87fd6288c148c291065d6032ceda3' * commit 'd6da372984c87fd6288c148c291065d6032ceda3': eacmv: stop using deprecated avcodec_set_dimensions dvdsubdec: stop using deprecated avcodec_set_dimensions dvdec: stop using deprecated avcodec_set_dimensions dpx: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/dpx.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/eacmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	f016a23c7f	Merge commit 'c7a5acabc537c2ce363165c31250aba341b1a990' * commit 'c7a5acabc537c2ce363165c31250aba341b1a990': dnxhddec: stop using deprecated avcodec_set_dimensions dirac: stop using deprecated avcodec_set_dimensions cdxl: stop using deprecated avcodec_set_dimensions avs: stop using deprecated avcodec_set_dimensions Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	5ef0c00580	Merge commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5' * commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5': ansi: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/ansi.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	66f436adf5	Merge commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213' * commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213': lavc/utils: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	51c5768cca	Merge commit 'ce6949d3a0607eb318dc2872553110df934e9720' * commit 'ce6949d3a0607eb318dc2872553110df934e9720': oggparsetheora: stop using deprecated avcodec_set_dimensions Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	7b91e9cf5d	Merge commit '7644f5a80787c9b608b82873604805d7e38a6a18' * commit '7644f5a80787c9b608b82873604805d7e38a6a18': lavc: replace avcodec_set_dimensions with ff_set_dimensions Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	f62dfed3de	h264: simplify frame_recovered code This is a separate commit to ease future bisecting in case it breaks something. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	78265fcfee	Merge commit '28096e0a806e57376541e6222d315619906e3c55' * commit '28096e0a806e57376541e6222d315619906e3c55': h264: wait for initial complete frame before outputing frames Conflicts: doc/APIchanges libavcodec/h264.c libavcodec/mpegvideo.h libavutil/frame.h libavutil/version.h See: `a64b028aeb` (as well as various later commits) Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Stefano Sabatini	2acc525d78	doc/encoders: add libfaac encoder documentation	11 years ago
Stefano Sabatini	d339e03fc3	doc/encoders: document the libfdk-aac wrapper Partially based on the https://trac.ffmpeg.org/wiki/AACEncodingGuide guide.	11 years ago
Stefano Sabatini	4fdec65eb3	doc/encoders: extend/clarify libtheora encoder documentation	11 years ago
Michael Niedermayer	a2bfee36b7	Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' * commit '9af7a8523a6bb517834ebed36093bdab11a8b38e': HNM4/HNM4A demuxer & video decoder Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	fc5fe4804f	Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191' * commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191': gradfun: x86: Factor out common code for some gradfun_filter_line() variants Conflicts: libavfilter/x86/vf_gradfun_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	ffe3350098	Merge commit 'ee80cf741a44115758e62399b7bde08d33161151' * commit 'ee80cf741a44115758e62399b7bde08d33161151': avfilter: x86: K&R formatting cosmetics Conflicts: libavfilter/x86/vf_gradfun_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Martin Storsjö	50aef03b24	rtspenc: Make sure BYE packets are sent before TEARDOWN Also make sure the BYE packets are sent at all when using TCP interleaved transport. Signed-off-by: Martin Storsjö <martin@martin.st>	11 years ago
Martin Storsjö	9ceed7af37	rtpenc: Add a rtpflag option for sending BYE packets when finishing Signed-off-by: Martin Storsjö <martin@martin.st>	11 years ago
Martin Storsjö	b264453de9	rtpenc: Remove some superfluous parentheses Signed-off-by: Martin Storsjö <martin@martin.st>	11 years ago
Martin Storsjö	d07b51bf07	aviobuf: Handle a NULL buffer in avio_close_dyn_buf This simplifies proper error handling in rtsp.c/rtspdec.c. When broadcasting over RTSP in TCP mode, the AVIOContext is closed and recreated for each sent packet, and if the recreation fails, we might try to close a NULL buffer when freeing things at the end. Previously, if recreating the buffer in rtspdec.c failed, this would crash later due to trying to close a NULL buffer. Signed-off-by: Martin Storsjö <martin@martin.st>	11 years ago

1 2 3 4 5 ...

57777 Commits (1295377f0a9de3140330d4467347f10d03ec4169) All Branches Search

57777 Commits (1295377f0a9de3140330d4467347f10d03ec4169)

All Branches