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
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>
2013-05-06ff_h264_decode_picture_parameter_set: fix return codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06ff_h264_decode_picture_parameter_set: use the correct spsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01h264_ps: check croping valuesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'Michael Niedermayer
* 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>
2013-04-19h264: fully support cropping.Anton Khirnov
Based on a patch by Vittorio Giovara <vittorio.giovara@gmail.com> Fixes Bug 378.
2013-02-26Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'Michael Niedermayer
* 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>
2013-02-26Remove unnecessary dsputil.h #includesDiego Biurrun
2013-02-21h264: check that luma and chroma depth matchMichael Niedermayer
Fixes out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-17Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2013-02-15h264: deMpegEncContextizeAnton Khirnov
Most of the changes are just trivial are just trivial replacements of fields from MpegEncContext with equivalent fields in H264Context. Everything in h264* other than h264.c are those trivial changes. The nontrivial parts are: 1) extracting a simplified version of the frame management code from mpegvideo.c. We don't need last/next_picture anymore, since h264 uses its own more complex system already and those were set only to appease the mpegvideo parts. 2) some tables that need to be allocated/freed in appropriate places. 3) hwaccels -- mostly trivial replacements. for dxva, the draw_horiz_band() call is moved from ff_dxva2_common_end_frame() to per-codec end_frame() callbacks, because it's now different for h264 and MpegEncContext-based decoders. 4) svq3 -- it does not use h264 complex reference system, so I just added some very simplistic frame management instead and dropped the use of ff_h264_frame_start(). Because of this I also had to move some initialization code to svq3. Additional fixes for chroma format and bit depth changes by Janne Grunau <janne-libav@jannau.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-01-25Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'Michael Niedermayer
* commit 'b85a5e87af4254b80913fe33591d96361f30832b': lavu: Add av_strnstr() h264: Allow discarding the cropping information from SPS Conflicts: Changelog doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-25h264: Allow discarding the cropping information from SPSVittorio Giovara
Some 3D systems overload the meaning of the field for other purposes. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-12-20Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'Michael Niedermayer
* commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011': cmdutils: pass number of groups to split_commandline(). mov: handle h263 and flv1 for codec_tag 'H','2','6','3' h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles Conflicts: libavcodec/h264_ps.c libavformat/isom.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profilesVictor Lopez
Fixes bug 396. CC: libav-stable@libav.org
2012-12-15h264: fix memleak on error during SPS parsingJanne Grunau
Introduced in d7d6efe42b0d.
2012-12-14Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'Michael Niedermayer
* commit '072be3e8969f24113d599444be4d6a0ed04a6602': h264: set parameters from SPS whenever it changes asyncts: cosmetics: reindent Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-05 14:23:39 +0300