FFmpeg

Commit Graph

Author	SHA1	Message	Date
Michael Niedermayer	2d614e9be1	Merge commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e' * commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e': vc1: move MpegEncContext.resync_marker into VC1Context. Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	26b526e776	Merge commit 'a5a71992cae34b321ceb8374f44ce17a945a3881' * commit 'a5a71992cae34b321ceb8374f44ce17a945a3881': mpeg4videoenc: don't set MpegEncContext.resync_marker Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	f5d6541ba0	Merge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb' * commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb': h263dec: remove commented out cruft Conflicts: libavcodec/h263dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	91c63cb053	avcodec/mpeg4videodec: copy rvlc in mpeg4_update_thread_context too Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	9c835acc1d	Merge commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe' * commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe': mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	cdc21e4abe	Merge commit '9f0617d2137bb7231b181d74392cd84ef4844cd7' * commit '9f0617d2137bb7231b181d74392cd84ef4844cd7': mpeg4videodec: remove write-only sprite variables from MpegEncContext Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	36068709b3	avcodec/mpeg4videodec: Fix code so it also works after moving vol_sprite_usage around Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	68c90fc086	Merge commit '1a89025793ca73d9685a8ce8e3194efa64dd6844' * commit '1a89025793ca73d9685a8ce8e3194efa64dd6844': mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	f602e22122	Merge commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea' * commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea': mpeg4videoenc: write 0 instead of vol_sprite_usage Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	e2f63be012	Merge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4' * commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4': mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	ad13b8ca9b	Merge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72' * commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72': mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext Conflicts: libavcodec/h263dec.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	be0b869b04	Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58' * commit '35e0833d410e31d9fd35695ad798c5d13de2af58': mpeg4videodec: add a mpeg4-specific private context. Conflicts: libavcodec/mpeg4video_parser.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	f924d6e40b	Merge commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f' * commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f': mxfdec: set extradata size Conflicts: libavformat/mxfdec.c no change as ffmpeg was not affected by this bug Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Timothy Gu	a677fb664a	RELEASE: update to 2.1.git Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Anton Khirnov	c2f7417eeb	vc1: move MpegEncContext.resync_marker into VC1Context. The field still remains in MpegEncContext because it is used by the mpeg4 decoder.	11 years ago
Anton Khirnov	a5a71992ca	mpeg4videoenc: don't set MpegEncContext.resync_marker It is only used in one place immediately after it is set.	11 years ago
Anton Khirnov	ad09f52586	h263dec: remove commented out cruft	11 years ago
Anton Khirnov	bc5abfb19e	mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext	11 years ago
Anton Khirnov	9f0617d213	mpeg4videodec: remove write-only sprite variables from MpegEncContext	11 years ago
Anton Khirnov	1a89025793	mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext	11 years ago
Anton Khirnov	75bd07f732	mpeg4videoenc: write 0 instead of vol_sprite_usage That field is never set for encoding.	11 years ago
Anton Khirnov	e62a43f6b1	mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext The field remains in MpegEncContext for use in the encoder.	11 years ago
Anton Khirnov	ee8af2dd99	mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext	11 years ago
Anton Khirnov	35e0833d41	mpeg4videodec: add a mpeg4-specific private context.	11 years ago
Anton Khirnov	95fd52c11b	mxfdec: set extradata size The line setting it was mistakenly removed in `ecf442a58b`	11 years ago
Michael Niedermayer	6e7de11444	avcodec/dcadec: decode LFE so we dont just add random data when downmixing with LFE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Stefano Sabatini	73b8730475	ffserver: improve error feedback in case of write_header() failure	11 years ago
Stefano Sabatini	b133ec6244	ffserver: improve feedback in case no feed is defined for a stream	11 years ago
Stefano Sabatini	0083514727	ffserver: improve feedback in case of stream with unknown feed name	11 years ago
Stefano Sabatini	0d640c08eb	doc/ffserver: specify missing argument for ACL feed option	11 years ago
Stefano Sabatini	6dac34b853	doc/ffserver: fix RTSPOtion tpo Spotted-by: ubitux	11 years ago
Stefano Sabatini	98e47c1a7e	doc/ffserver: extend documentation for Feed/File stream options	11 years ago
Stefano Sabatini	0e64edda18	doc/ffserver: uncomment line in stream section example	11 years ago
Stefano Sabatini	cdff4c5313	doc/ffserver: reorder encoding options, and mark them as such Also add notice about ffmpeg -override_ffserver option.	11 years ago
Stefano Sabatini	f87e189ee0	doc/ffserver: extend documentation for various file-related options	11 years ago
Stefano Sabatini	b1049f89fa	ffserver: deprecate inconsistent parsing behavior of Truncate option Also make it accept the more consistent behavior (boolean option set to true when specified).	11 years ago
Stefano Sabatini	0124fca03f	ffserver: extend feedback in http_start_receive_data()	11 years ago
Michael Niedermayer	d2e46b11e4	avcodec/dcadec: set AV_CLASS_CATEGORY Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	55bd20a841	avcodec/dcadec: AVClass is const Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	5b3c684147	Merge remote-tracking branch 'qatar/master' * qatar/master: dcadec: add disable_xch private option. Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	3f41e57fa8	Merge commit '220494ad0b2e9e980ef703b46b69308236f29be5' * commit '220494ad0b2e9e980ef703b46b69308236f29be5': dcadec: treat all 2-channel modes as Stereo in dca_downmix. Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	97468463a2	Merge commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48' * commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48': dca: support mixing LFE in dca_downmix. Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	7ea9c4a94c	Merge commit '149438cfe5d233c46bb18341b7c574fe643dd5f2' * commit '149438cfe5d233c46bb18341b7c574fe643dd5f2': dca: improve default stereo downmix coefficients. Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	12235a3ed2	avcodec/dcadec: print more details about errors Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	43ec456320	Merge commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1' * commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1': dca: extract core substream's embedded downmix coeffcient codes, if present. Conflicts: libavcodec/dcadata.h libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	c122e697fa	Merge commit '27245b4e1bbb7a863341db321b5bdc5792e427d9' * commit '27245b4e1bbb7a863341db321b5bdc5792e427d9': dca: remove embedded downmix coefficient extraction. Conflicts: libavcodec/dcadata.h libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	a7f8817720	Merge commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d' * commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d': dca: convert dca_default_coeffs to float. Conflicts: libavcodec/dcadata.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	e9a47896a0	Merge commit '25609b63d2e07d26d610f485a22082d32c96c0f5' * commit '25609b63d2e07d26d610f485a22082d32c96c0f5': dcadec: store the stereo downmix coefficients as float in the DCAContext. Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	cb751a6a96	Merge commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e' * commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e': dcadec: implement request_channel_layout. Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Stefano Sabatini	d1daa71f9d	doc/ffserver: mention remaining stream options	11 years ago

1 2 3 4 5 ...

58616 Commits (2d614e9be14cb493c56448467b38865137e9e855) All Branches Search

58616 Commits (2d614e9be14cb493c56448467b38865137e9e855)

All Branches