FFmpeg

Commit Graph

Author	SHA1	Message	Date
Michael Niedermayer	f09f295109	Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763' * commit 'e026ee0446de27fc38e33e98704fada012fdc763': mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	7f18cb9101	Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58' * commit '513d849bb605d3d862da1ada709bd2ca1ac68f58': mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	4c55aa8f93	Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091' * commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091': mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	ae4e7f7ba6	Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1' * commit '58c120a9290eef057dbf26761a4f89b7f67bbde1': mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	b27ba2e540	Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324' * commit '6e81597d5a89f64dfab5c7e99e46b4355139e324': mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	aeead42789	Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5' * commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5': mpeg4videodec: remove a write-only variable from MpegEncContext Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	1897c4a119	Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab' * commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab': mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	47e5eaf8c9	Merge commit 'e89247debd5276d57ce4a26516224204f9541af0' * commit 'e89247debd5276d57ce4a26516224204f9541af0': mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	f4c28aea38	Merge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07' * commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07': mpeg4videodec: remove a write-only variable from MpegEncContext Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	0cea39fdd3	Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809' * commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809': mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	79c1cdd973	mpeg4_update_thread_context: copy the whole mpeg4 specific context instead of variables one by one This simplifies the code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	3e5cd34cd0	Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e' * commit '038890740014dc33d2e2f04da7cf0a9da821264e': mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	b08ff07d8d	avcodec/mpeg4videodec: update bug workaround related variables like they where before This fixes the code after the variables have been moved into the mpeg4 decoder. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	b4ef7447eb	Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072' * commit '43af264de8606668c6b2fa7f96c946bdc3dbe072': mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	ec5499d8ba	Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb' * commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb': mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpeg4videodec Conflicts: libavcodec/h263dec.c libavcodec/mpeg4video.h libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	b239f3f69d	avcodec/h263dec: move call to ff_mpeg4_workaround_bugs() under codec_id check Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	2b1922d964	Merge commit 'b452d5ae866942cec00aa1432fe29498b38b49fc' * commit 'b452d5ae866942cec00aa1432fe29498b38b49fc': mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4 Conflicts: libavcodec/h263dec.c not merged, the header decode function is not the right place See: `6c9b82b6a0` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	6c9b82b6a0	avcodec/mpeg4videodec: move bug workaround code into seperate function Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	ee9d53e572	Merge commit '48e139409556861c9e561ce34133891d8eecc3cf' * commit '48e139409556861c9e561ce34133891d8eecc3cf': mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext. Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	2d2b363c65	h263: remove unused ff_h263_find_resync_marker() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
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
Kostya Shishkov	01f6df01b6	go2meeting: disallow tile dimensions that are not multiple of 16 Original decoder seems to always use 176x128 tiles anyway and this helps avoiding lots of issues with odd tile sizes in fuzzed files. Signed-off-by: Anton Khirnov <anton@khirnov.net>	11 years ago
Anton Khirnov	e026ee0446	mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext	11 years ago
Anton Khirnov	513d849bb6	mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext	11 years ago
Anton Khirnov	9ba3fc3e3d	mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext	11 years ago
Anton Khirnov	58c120a929	mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext	11 years ago
Anton Khirnov	6e81597d5a	mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext	11 years ago
Anton Khirnov	2992afda83	mpeg4videodec: remove a write-only variable from MpegEncContext	11 years ago
Anton Khirnov	3b1c0f686d	mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext	11 years ago
Anton Khirnov	e89247debd	mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable	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	8cebc9eaac	mpeg4videodec: remove a write-only variable from MpegEncContext	11 years ago
Anton Khirnov	b1aacd5668	mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext	11 years ago
Anton Khirnov	0388907400	mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext	11 years ago
Anton Khirnov	43af264de8	mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext	11 years ago
Anton Khirnov	e2ceb17642	mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpeg4videodec	11 years ago
Anton Khirnov	b452d5ae86	mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4	11 years ago
Anton Khirnov	48e1394095	mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.	11 years ago

... 2 3 4 5 6 ...

58805 Commits (e424abc3a0933653c59c3800b9b7ac3fadf41303) All Branches Search

58805 Commits (e424abc3a0933653c59c3800b9b7ac3fadf41303)

All Branches