summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_ps.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * h264: use the correct SPS during PPS parsingAnton Khirnov2015-04-051-8/+14
| | | | | | | | | | There is in general no reason for the currently active SPS to be the one referenced by the PPS being parsed.
* | Merge commit 'd8a45d2d49f54fde042b195f9d5859251252493d'Michael Niedermayer2015-03-211-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'd8a45d2d49f54fde042b195f9d5859251252493d': h264_ps: properly check cropping parameters against overflow Conflicts: libavcodec/h264_ps.c See: c3bd306e78f9e3ca2f136f5b30cbe49fa0884f82 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_ps: properly check cropping parameters against overflowAnton Khirnov2015-03-211-4/+16
| | | | | | | | CC: libav-stable@libav.org
* | avcodec/h264_ps: More completely check the bit depthsMichael Niedermayer2015-02-061-1/+2
| | | | | | | | | | | | | | | | 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>
* | h264_ps: move and export aspect_ratioChristophe Gisquet2014-11-301-23/+3
| | | | | | | | | | | | Needed for filters that may need it, like an SPS bsf. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-151-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-151-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'Michael Niedermayer2014-04-021-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e': More correct printf format specifiers Conflicts: libavcodec/h264_ps.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * More correct printf format specifiersDiego Biurrun2014-04-021-1/+1
| | | | | | | | This avoids compiler warnings about argument and specifier type mismatch.
* | Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'Michael Niedermayer2014-03-221-5/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avcodec: more correct printf specifiersDiego Biurrun2014-03-221-5/+7
| |
* | Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'Michael Niedermayer2014-03-171-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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>
| * h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private defineVittorio Giovara2014-03-161-1/+1
| |
* | Merge commit 'ee6280ca12696a67535ce2245c77190edc513794'Michael Niedermayer2014-03-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'ee6280ca12696a67535ce2245c77190edc513794': h264: parse two additional constraint flags Conflicts: libavcodec/h264_ps.c See: 9091ba9dfa0901bdce8305cf282c747b0f4c942e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: parse two additional constraint flagsVittorio Giovara2014-02-281-1/+3
| |
* | Merge commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2'Michael Niedermayer2014-03-011-5/+11
|\ \ | |/ | | | | | | | | | | * commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2': h264: add MVCD to the list of High profiles in SPS Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: add MVCD to the list of High profiles in SPSVittorio Giovara2014-02-281-5/+11
| | | | | | | | Also comment all previous profiles.
* | avcodec/h264_ps: fix printed num_reorder_frames valueMichael Niedermayer2014-02-221-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e'Michael Niedermayer2014-02-171-3/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e': h264: use avpriv_request_sample for chroma_format_idc Conflicts: libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: use avpriv_request_sample for chroma_format_idcVittorio Giovara2014-02-161-3/+2
| |
* | Merge commit '3a0576702825423abecb32627c530dbc4c0f73bc'Michael Niedermayer2014-02-141-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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>
| * h264: store current_sps_id inside the current spsVittorio Giovara2014-02-141-1/+1
| | | | | | | | In preparation for MVC support.
* | Merge commit '73e8fab31dc19c4371499e612856accbc00b2820'Michael Niedermayer2014-02-141-4/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '73e8fab31dc19c4371499e612856accbc00b2820': h264: print values in case of error Conflicts: libavcodec/h264.c libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: print values in case of errorVittorio Giovara2014-02-141-5/+6
| | | | | | | | Also make error style consistent and drop redundant information.
* | Merge commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c'Michael Niedermayer2014-01-181-1/+3
|\ \ | |/ | | | | | | | | | | | | | | * 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>
| * h264: reset num_reorder_frames if it is invalidAnton Khirnov2014-01-181-1/+3
| | | | | | | | | | | | | | | | | | 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
* | Merge commit 'bfd26b7ce6efea594f2b99441d900419df3af638'Michael Niedermayer2014-01-061-1/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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>
| * h264: reject mismatching luma/chroma bit depths during sps parsingAnton Khirnov2014-01-061-0/+5
| | | | | | | | | | | | | | | | | | | | 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
* | Merge commit '94603feb1b3ad01a821a1a1cef1570b13f471821'Michael Niedermayer2013-10-281-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * h264_ps: when parsing a VUI fails, only abort when explode is setAnton Khirnov2013-10-271-2/+4
| | | | | | | | | | | | 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.
* | Merge commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1'Michael Niedermayer2013-08-211-11/+11
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1': h264_ps: Use more meaningful error values Conflicts: libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_ps: Use more meaningful error valuesDiego Biurrun2013-08-201-12/+12
| |
* | Merge commit '330ad1f6a53a37dec228cb424ca57e1268fafc64'Michael Niedermayer2013-08-211-319/+337
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '330ad1f6a53a37dec228cb424ca57e1268fafc64': h264_ps: K&R formatting cosmetics Conflicts: libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_ps: K&R formatting cosmeticsDiego Biurrun2013-08-201-287/+313
| |
* | Merge commit '8fed466b0a7d636ae5035f9c6074fba9a621539b'Michael Niedermayer2013-08-211-4/+0
|\ \ | |/ | | | | | | | | | | * commit '8fed466b0a7d636ae5035f9c6074fba9a621539b': h264_ps: Drop commented-out cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_ps: Drop commented-out cruftDiego Biurrun2013-08-201-4/+0
| |
* | Merge commit '2a61592573d725956a4377641344afe263382648'Michael Niedermayer2013-08-211-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avcodec: Remove some commented-out debug cruftDiego Biurrun2013-08-201-1/+0
| |
* | avcodec/h264_ps: try to support Ambarella AVCMichael Niedermayer2013-07-091-0/+5
| | | | | | | | | | | | Fixes Ticket2763 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264_ps: fix memleak in ff_h264_decode_picture_parameter_set()Michael Niedermayer2013-06-031-2/+2
| | | | | | | | | | Fixes: CID1026763 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_h264_decode_seq_parameter_set: dont set h->spsMichael Niedermayer2013-05-061-2/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_h264_decode_picture_parameter_set: fix return codeMichael Niedermayer2013-05-061-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_h264_decode_picture_parameter_set: use the correct spsMichael Niedermayer2013-05-061-9/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264_ps: check croping valuesMichael Niedermayer2013-04-301-0/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'Michael Niedermayer2013-04-191-26/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e83d9aced2fc2b2e1360452794c58aba55d497c': h264: fully support cropping. Conflicts: doc/APIchanges libavcodec/h264.c libavcodec/h264_ps.c libavcodec/options_table.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: fully support cropping.Anton Khirnov2013-04-191-19/+27
| | | | | | | | | | | | Based on a patch by Vittorio Giovara <vittorio.giovara@gmail.com> Fixes Bug 378.
* | Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'Michael Niedermayer2013-02-261-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f': Remove unnecessary dsputil.h #includes Conflicts: libavcodec/ffv1.c libavcodec/h261dec.c libavcodec/h261enc.c libavcodec/h264pred.c libavcodec/lpc.h libavcodec/mjpegdec.c libavcodec/rectangle.h libavcodec/x86/idct_sse2_xvid.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unnecessary dsputil.h #includesDiego Biurrun2013-02-261-1/+0
| |
* | h264: check that luma and chroma depth matchMichael Niedermayer2013-02-211-1/+1
| | | | | | | | | | | | | | Fixes out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-161-143/+137
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: deMpegEncContextize Conflicts: libavcodec/dxva2_h264.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_mb_template.c libavcodec/h264_parser.c libavcodec/h264_ps.c libavcodec/h264_refs.c libavcodec/h264_sei.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud