summaryrefslogtreecommitdiffstats
path: root/libavcodec/mpeg4videodec.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'Michael Niedermayer2014-03-171-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b': mpegvideo: move mpegvideo formats-related defines to mpegutils.h Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_mvpred.h libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move mpegvideo formats-related defines to mpegutils.hVittorio Giovara2014-03-161-0/+1
| |
| * xvid: switch to xvid mmx idct as soon as possibleJanne Grunau2014-01-311-29/+29
| | | | | | | | | | | | | | The idct implementation cannot be changed after the quantization matrices are read since it use a different permutaion. Bug-Id: videolan/7411
* | avcodec/mpeg4videodec: Check for bitstream overread in decode_vol_header()Michael Niedermayer2014-02-201-0/+5
| | | | | | | | | | | | | | Fixes out of array read Fixes: 08e48e9daae7d8f8ab6dbe3919e797e5-asan_heap-oob_157461c_5295_cov_1266798650_firefing.mpg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: set field durations to safe values when they are invalidMichael Niedermayer2014-02-191-2/+4
| | | | | | | | | | | | | | Fixes division by 0 Fixes: 3c980274cecaca6ca5d6e517c0c1983e-signal_sigabrt_7ffff7125425_410_cov_3621042467_2_audio_streams.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: use av_fast_padded_malloc() for bitstream bufferMichael Niedermayer2014-01-071-3/+2
| | | | | | | | | | | | Fixes use of uninitialized memory with vlc (sample from ticket3277) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'Michael Niedermayer2013-12-061-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55': mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-12-051-2/+2
| |
* | Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'Michael Niedermayer2013-12-061-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'f7d228676cb7669059889c4225c8a8dc56708c24': mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-12-051-4/+4
| |
* | Merge commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2'Michael Niedermayer2013-12-061-8/+9
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2': mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-12-051-8/+9
| |
* | Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763'Michael Niedermayer2013-11-301-23/+23
|\ \ | |/ | | | | | | | | | | * 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-291-23/+23
| |
* | Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'Michael Niedermayer2013-11-301-8/+8
|\ \ | |/ | | | | | | | | | | * 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-291-8/+8
| | | | | | | | Mpeg4DecContext
* | Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'Michael Niedermayer2013-11-301-2/+2
|\ \ | |/ | | | | | | | | | | * 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-291-2/+2
| | | | | | | | Mpeg4DecContext
* | Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'Michael Niedermayer2013-11-301-5/+5
|\ \ | |/ | | | | | | | | | | * 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-291-4/+4
| |
* | Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'Michael Niedermayer2013-11-301-2/+2
|\ \ | |/ | | | | | | | | | | * 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-291-2/+2
| |
* | Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'Michael Niedermayer2013-11-301-1/+1
|\ \ | |/ | | | | | | | | | | * 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-291-1/+1
| |
* | Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'Michael Niedermayer2013-11-301-5/+5
|\ \ | |/ | | | | | | | | | | * 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-291-3/+3
| |
* | Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'Michael Niedermayer2013-11-301-3/+1
|\ \ | |/ | | | | | | | | | | * 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-291-3/+1
| |
* | Merge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07'Michael Niedermayer2013-11-301-1/+1
|\ \ | |/ | | | | | | | | | | * 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-291-1/+1
| |
* | Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'Michael Niedermayer2013-11-301-9/+9
|\ \ | |/ | | | | | | | | | | * 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-291-9/+9
| |
* | mpeg4_update_thread_context: copy the whole mpeg4 specific context instead ↵Michael Niedermayer2013-11-301-8/+1
| | | | | | | | | | | | | | | | of variables one by one This simplifies the code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'Michael Niedermayer2013-11-301-30/+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-291-30/+30
| | | | | | | | Mpeg4DecContext
* | avcodec/mpeg4videodec: update bug workaround related variables like they ↵Michael Niedermayer2013-11-301-0/+4
| | | | | | | | | | | | | | | | | | 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-301-52/+55
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-291-53/+56
| | | | | | | | MpegEncContext to Mpeg4DecContext
* | Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'Michael Niedermayer2013-11-301-0/+42
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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-291-0/+43
| | | | | | | | mpeg4videodec
| * mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4Anton Khirnov2013-11-291-0/+86
| |
* | avcodec/mpeg4videodec: move bug workaround code into seperate functionMichael Niedermayer2013-11-301-0/+113
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '48e139409556861c9e561ce34133891d8eecc3cf'Michael Niedermayer2013-11-301-7/+8
|\ \ | |/ | | | | | | | | | | * 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-291-2/+2
| |
* | avcodec/mpeg4videodec: copy rvlc in mpeg4_update_thread_context tooMichael Niedermayer2013-11-291-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe'Michael Niedermayer2013-11-291-3/+3
|\ \ | |/ | | | | | | | | | | * commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe': mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContextAnton Khirnov2013-11-291-2/+2
| |
* | Merge commit '9f0617d2137bb7231b181d74392cd84ef4844cd7'Michael Niedermayer2013-11-291-4/+4
|\ \ | |/ | | | | | | | | | | * commit '9f0617d2137bb7231b181d74392cd84ef4844cd7': mpeg4videodec: remove write-only sprite variables from MpegEncContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: remove write-only sprite variables from MpegEncContextAnton Khirnov2013-11-291-4/+4
| |
* | avcodec/mpeg4videodec: Fix code so it also works after moving ↵Michael Niedermayer2013-11-291-0/+1
| | | | | | | | | | | | vol_sprite_usage around Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud