summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-30
|\ | | | | | | | | | | | | | | | | | | * qatar/master: dcadec: Add some logging before returning on error Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dcadec: Add some logging before returning on errorTim Walker2013-11-30
| | | | | | | | | | | | Based on a patch by Michael Niedermayer. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avcodec/mpeg4video: fix doxycomments so they are not associated with random ↵Michael Niedermayer2013-11-30
| | | | | | | | | | | | unrelated fields Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/srtenc: use bprint for text buffers.Nicolas George2013-11-30
| | | | | | | | Fix trac ticket #3120.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * qatar/master: go2meeting: disallow tile dimensions that are not multiple of 16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * go2meeting: disallow tile dimensions that are not multiple of 16Kostya Shishkov2013-11-29
| | | | | | | | | | | | | | 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>
* | Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * commit 'e026ee0446de27fc38e33e98704fada012fdc763': mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-29
| |
* | Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * commit '513d849bb605d3d862da1ada709bd2ca1ac68f58': mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move num_sprite_warping_points from MpegEncContext to ↵Anton Khirnov2013-11-29
| | | | | | | | Mpeg4DecContext
* | Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091': mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move sprite_brightness_change from MpegEncContext to ↵Anton Khirnov2013-11-29
| | | | | | | | Mpeg4DecContext
* | Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * commit '58c120a9290eef057dbf26761a4f89b7f67bbde1': mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-29
| |
* | Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * commit '6e81597d5a89f64dfab5c7e99e46b4355139e324': mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-29
| |
* | Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5': mpeg4videodec: remove a write-only variable from MpegEncContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: remove a write-only variable from MpegEncContextAnton Khirnov2013-11-29
| |
* | Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab': mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-29
| |
* | Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * commit 'e89247debd5276d57ce4a26516224204f9541af0': mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variableAnton Khirnov2013-11-29
| |
* | Merge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07': mpeg4videodec: remove a write-only variable from MpegEncContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: remove a write-only variable from MpegEncContextAnton Khirnov2013-11-29
| |
* | Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809': mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-29
| |
* | mpeg4_update_thread_context: copy the whole mpeg4 specific context instead ↵Michael Niedermayer2013-11-30
| | | | | | | | | | | | | | | | of variables one by one This simplifies the code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | | | | | | | * commit '038890740014dc33d2e2f04da7cf0a9da821264e': mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to ↵Anton Khirnov2013-11-29
| | | | | | | | Mpeg4DecContext
* | avcodec/mpeg4videodec: update bug workaround related variables like they ↵Michael Niedermayer2013-11-30
| | | | | | | | | | | | | | | | | | where before This fixes the code after the variables have been moved into the mpeg4 decoder. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | | | | | | | * commit '43af264de8606668c6b2fa7f96c946bdc3dbe072': mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move mpeg4-specific bug workaround variables from ↵Anton Khirnov2013-11-29
| | | | | | | | MpegEncContext to Mpeg4DecContext
* | Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to ↵Anton Khirnov2013-11-29
| | | | | | | | mpeg4videodec
| * mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4Anton Khirnov2013-11-29
| |
* | avcodec/h263dec: move call to ff_mpeg4_workaround_bugs() under codec_id checkMichael Niedermayer2013-11-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: move bug workaround code into seperate functionMichael Niedermayer2013-11-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '48e139409556861c9e561ce34133891d8eecc3cf'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * commit '48e139409556861c9e561ce34133891d8eecc3cf': mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.Anton Khirnov2013-11-29
| |
* | h263: remove unused ff_h263_find_resync_marker()Michael Niedermayer2013-11-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e'Michael Niedermayer2013-11-30
|\| | | | | | | | | | | | | * commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e': vc1: move MpegEncContext.resync_marker into VC1Context. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: move MpegEncContext.resync_marker into VC1Context.Anton Khirnov2013-11-29
| | | | | | | | | | The field still remains in MpegEncContext because it is used by the mpeg4 decoder.
* | Merge commit 'a5a71992cae34b321ceb8374f44ce17a945a3881'Michael Niedermayer2013-11-29
|\| | | | | | | | | | | | | * commit 'a5a71992cae34b321ceb8374f44ce17a945a3881': mpeg4videoenc: don't set MpegEncContext.resync_marker Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videoenc: don't set MpegEncContext.resync_markerAnton Khirnov2013-11-29
| | | | | | | | It is only used in one place immediately after it is set.
* | Merge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb'Michael Niedermayer2013-11-29
|\| | | | | | | | | | | | | | | | | | | * commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb': h263dec: remove commented out cruft Conflicts: libavcodec/h263dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: remove commented out cruftAnton Khirnov2013-11-29
| |
* | avcodec/mpeg4videodec: copy rvlc in mpeg4_update_thread_context tooMichael Niedermayer2013-11-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe'Michael Niedermayer2013-11-29
|\| | | | | | | | | | | | | * commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe': mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContextAnton Khirnov2013-11-29
| |
* | Merge commit '9f0617d2137bb7231b181d74392cd84ef4844cd7'Michael Niedermayer2013-11-29
|\| | | | | | | | | | | | | * commit '9f0617d2137bb7231b181d74392cd84ef4844cd7': mpeg4videodec: remove write-only sprite variables from MpegEncContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 13:47:25 +0000