summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_sei.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/h264_sei: Try to make code more robust by jumping to the specified ↵Michael Niedermayer2013-07-221-3/+3
| | | | | | SEI ends Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/ff_h264_decode_sei: use skip_bits_long()Michael Niedermayer2013-07-211-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/ff_h264_decode_sei: Check SEI sizeMichael Niedermayer2013-07-211-0/+5
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/ff_h264_decode_sei: fix integer overflow with size.Michael Niedermayer2013-07-211-1/+2
| | | | | | This issue is hypothetical and no testcase is available. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264_sei/ff_h264_decode_sei: fix error codes for insufficient dataMichael Niedermayer2013-07-211-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264: add frame packing as stereo_mode frame metadataJoakim Plate2013-07-211-0/+86
| | | | | | | This matches the matroska defintion of stereo_mode, with no metadata written if no info exist in sei Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264_sei/decode_picture_timing: do not depend on h->sps being setMichael Niedermayer2013-05-061-6/+13
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264: show recovery SEIs in debug outputMichael Niedermayer2013-03-121-0/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-161-65/+57
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * h264: deMpegEncContextizeAnton Khirnov2013-02-151-49/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | h264: add support for AFD detectionMarton Balint2012-10-211-0/+41
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Kieran Kunhya <kierank@ob-encoder.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: fix x264 build detectionMichael Niedermayer2012-08-131-0/+2
| | | | | | | | | | | | Fixes Ticket1503 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: some fields in SEIs are longer than 25 bits thus use get_bits_long()Michael Niedermayer2012-04-231-4/+4
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) cdxl demux: do not create packets with uninitialized data at EOF. Replace computations of remaining bits with calls to get_bits_left(). amrnb/amrwb: Remove get_bits usage. cosmetics: reindent avformat: do not require a pixel/sample format if there is no decoder avformat: do not fill-in audio packet duration in compute_pkt_fields() lavf: Use av_get_audio_frame_duration() in get_audio_frame_size() dca_parser: parse the sample rate and frame durations libspeexdec: do not set AVCodecContext.frame_size libopencore-amr: do not set AVCodecContext.frame_size alsdec: do not set AVCodecContext.frame_size siff: do not set AVCodecContext.frame_size amr demuxer: do not set AVCodecContext.frame_size. aiffdec: do not set AVCodecContext.frame_size mov: do not set AVCodecContext.frame_size ape: do not set AVCodecContext.frame_size. rdt: remove workaround for infinite loop with aac avformat: do not require frame_size in avformat_find_stream_info() for CELT avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3 avformat: do not require frame_size in avformat_find_stream_info() for AAC ... Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/avcodec.h libavcodec/h264.c libavcodec/h264_ps.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/dsputil_mmx.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace computations of remaining bits with calls to get_bits_left().Alex Converse2012-03-051-1/+1
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | h264_sei: Fix infinite loop.Michael Niedermayer2012-01-261-0/+4
| | | | | | | | | | | | | | Fixes not yet fixed parts of CVE-2011-3946. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: allow debuging SEI typesMichael Niedermayer2011-08-301-0/+3
|/ | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Ignore x264 build=0 as there is no such version, this restores previousMichael Niedermayer2010-03-211-1/+1
| | | | | | behavior approximately. Originally committed as revision 22628 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split SEI code off h264.c.Michael Niedermayer2010-01-121-0/+206
Originally committed as revision 21168 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud