Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavcodec/h264_ps.c
AgeCommit message (Collapse)Author
2015-07-27Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: AV-prefix all codec flagsVittorio Giovara
Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-20Merge commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf'Michael Niedermayer
* commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf': h264_ps: Return meaningful error codes and address a memory leak Conflicts: libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20h264_ps: Return meaningful error codes and address a memory leakVittorio Giovara
Bug-Id: CID 1026763
2015-04-16avcodec/h264_ps: Validate num_units_in_tick/time_scale before setting them ↵Michael Niedermayer
in the context This probably makes no big difference but it is more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-16h264: Do not fail on unsupported timing infoVittorio Giovara
The spec madandate both time_scale and num_units_in_tick greater than 0, however since they are not essential for decoding, just ignore the whole block and try to finish parsing the VUI. Related to Ticket4445. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-10avcodec/h264: Do not fail with randomly truncated VUIsMichael Niedermayer
Fixes Ticket4445 Tested-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-08avcodec/h264_ps: Move truncation check from VUI to SPSMichael Niedermayer
This more completely checks for truncation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-05Merge commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76'Michael Niedermayer
* commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76': h264: use the correct SPS during PPS parsing Conflicts: libavcodec/h264_ps.c See: dc35b77b28f40c99d27c073fe2c22219ba600202 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-05h264: use the correct SPS during PPS parsingAnton Khirnov
There is in general no reason for the currently active SPS to be the one referenced by the PPS being parsed.
2015-03-21Merge commit 'd8a45d2d49f54fde042b195f9d5859251252493d'Michael Niedermayer
* commit 'd8a45d2d49f54fde042b195f9d5859251252493d': h264_ps: properly check cropping parameters against overflow Conflicts: libavcodec/h264_ps.c See: c3bd306e78f9e3ca2f136f5b30cbe49fa0884f82 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21h264_ps: properly check cropping parameters against overflowAnton Khirnov
CC: libav-stable@libav.org
2015-02-06avcodec/h264_ps: More completely check the bit depthsMichael Niedermayer
Fixes out of array read Fixes: asan_static-oob_30328b6_719_cov_3325483287_H264_artifacts_motion.h264 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30h264_ps: move and export aspect_ratioChristophe Gisquet
Needed for filters that may need it, like an SPS bsf. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-04-02Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'Michael Niedermayer
* commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e': More correct printf format specifiers Conflicts: libavcodec/h264_ps.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02More correct printf format specifiersDiego Biurrun
This avoids compiler warnings about argument and specifier type mismatch.
2014-03-22Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'Michael Niedermayer
* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198': avcodec: more correct printf specifiers Conflicts: libavcodec/4xm.c libavcodec/alsdec.c libavcodec/dfa.c libavcodec/h264_ps.c libavcodec/jpeg2000dec.c libavcodec/lagarith.c libavcodec/mpeg12dec.c libavcodec/rv10.c libavcodec/svq3.c libavcodec/wmaprodec.c libavcodec/xwddec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22avcodec: more correct printf specifiersDiego Biurrun
2014-03-17Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'Michael Niedermayer
* commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27': h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define Conflicts: libavcodec/h264.c libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private defineVittorio Giovara
2014-03-01Merge commit 'ee6280ca12696a67535ce2245c77190edc513794'Michael Niedermayer
* commit 'ee6280ca12696a67535ce2245c77190edc513794': h264: parse two additional constraint flags Conflicts: libavcodec/h264_ps.c See: 9091ba9dfa0901bdce8305cf282c747b0f4c942e Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-01Merge commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2'n2.3-devMichael Niedermayer
* commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2': h264: add MVCD to the list of High profiles in SPS Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-28h264: parse two additional constraint flagsVittorio Giovara
2014-02-28h264: add MVCD to the list of High profiles in SPSVittorio Giovara
Also comment all previous profiles.
2014-02-22avcodec/h264_ps: fix printed num_reorder_frames valueMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-17Merge commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e'Michael Niedermayer
* commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e': h264: use avpriv_request_sample for chroma_format_idc Conflicts: libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-17h264: use avpriv_request_sample for chroma_format_idcVittorio Giovara
2014-02-14Merge commit '3a0576702825423abecb32627c530dbc4c0f73bc'Michael Niedermayer
* commit '3a0576702825423abecb32627c530dbc4c0f73bc': h264: store current_sps_id inside the current sps Conflicts: libavcodec/h264.c libavcodec/h264_ps.c The current_sps_id is not removed as it used in security related code. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-14Merge commit '73e8fab31dc19c4371499e612856accbc00b2820'Michael Niedermayer
* commit '73e8fab31dc19c4371499e612856accbc00b2820': h264: print values in case of error Conflicts: libavcodec/h264.c libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-14h264: store current_sps_id inside the current spsVittorio Giovara
In preparation for MVC support.
2014-02-14h264: print values in case of errorVittorio Giovara
Also make error style consistent and drop redundant information.
2014-01-19Merge commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c'Michael Niedermayer
* commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c': h264: reset num_reorder_frames if it is invalid Note, num_reorder_frames is not used in the failure case Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-18h264: reset num_reorder_frames if it is invalidAnton Khirnov
An invalid VUI is not considered a fatal error, so the SPS containing it may still be used. Leaving an invalid value of num_reorder_frames there can result in writing over the bounds of H264Context.delayed_pic. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
2014-01-06Merge commit 'bfd26b7ce6efea594f2b99441d900419df3af638'Michael Niedermayer
* commit 'bfd26b7ce6efea594f2b99441d900419df3af638': h264: reject mismatching luma/chroma bit depths during sps parsing Conflicts: libavcodec/h264_ps.c See: bdeb61ccc67911cfc5e20c7cfb1312d0501ca90a Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-06h264: reject mismatching luma/chroma bit depths during sps parsingAnton Khirnov
There is no point in delaying the check and it avoids bugs with a half-initialized context. Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
2013-10-28Merge commit '94603feb1b3ad01a821a1a1cef1570b13f471821'Michael Niedermayer
* commit '94603feb1b3ad01a821a1a1cef1570b13f471821': h264_ps: when parsing a VUI fails, only abort when explode is set Merge only for metadata, ignoring invalid data can put the context into an invalid state and can possibly be used for remote code execution exploits. Also we support all non standard VUIs that have been reported so ignoring parsing failure makes no sense for us unless theres some issue that has not been reported Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28h264_ps: when parsing a VUI fails, only abort when explode is setAnton Khirnov
A VUI doesn't contain anything strictly necessary for decoding. Apparently there are many samples with truncated VUIs in the wild, this commit should allow decoding them.
2013-08-21Merge commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1'Michael Niedermayer
* commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1': h264_ps: Use more meaningful error values Conflicts: libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-21Merge commit '330ad1f6a53a37dec228cb424ca57e1268fafc64'Michael Niedermayer
* commit '330ad1f6a53a37dec228cb424ca57e1268fafc64': h264_ps: K&R formatting cosmetics Conflicts: libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-21Merge commit '8fed466b0a7d636ae5035f9c6074fba9a621539b'Michael Niedermayer
* commit '8fed466b0a7d636ae5035f9c6074fba9a621539b': h264_ps: Drop commented-out cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-21Merge commit '2a61592573d725956a4377641344afe263382648'Michael Niedermayer
* commit '2a61592573d725956a4377641344afe263382648': avcodec: Remove some commented-out debug cruft Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_mvpred.h libavcodec/mjpegdec.c libavcodec/mjpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-20h264_ps: Use more meaningful error valuesDiego Biurrun
2013-08-20h264_ps: K&R formatting cosmeticsDiego Biurrun
2013-08-20h264_ps: Drop commented-out cruftDiego Biurrun
2013-08-20avcodec: Remove some commented-out debug cruftDiego Biurrun
2013-07-09avcodec/h264_ps: try to support Ambarella AVCMichael Niedermayer
Fixes Ticket2763 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03h264_ps: fix memleak in ff_h264_decode_picture_parameter_set()Michael Niedermayer
Fixes: CID1026763 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06ff_h264_decode_seq_parameter_set: dont set h->spsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 16:29:42 +0300