summaryrefslogtreecommitdiff
path: root/libavcodec/aac_parser.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec: fix aac/ac3 parser bitstream buffer sizeMichael Niedermayer2014-08-221-1/+1
| | | | | | | | | | | Buffers containing copies of the AAC and AC3 header bits were not padded before parsing, violating init_get_bits() buffer padding requirement, leading to potential buffer read overflows. This change adds FF_INPUT_BUFFER_PADDING_SIZE bytes to the bit buffer for parsing the header in each of aac_parser.c and ac3_parser.c. Based on patch by: Matt Wolenetz <wolenetz@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-031-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (44 commits) replacement Indeo 3 decoder gsm demuxer: do not allocate packet twice. flvenc: use first packet delay as global delay. ac3enc: doxygen update. imc: return error codes instead of 0 for error conditions. imc: return meaningful error codes instead of -1 imc: do not set channel layout for stereo imc: validate channel count imc: check for ff_fft_init() failure imc: check output buffer size before decoding imc: use DSPContext.bswap16_buf() to byte-swap packet data rtsp: add allowed_media_types option libgsm: add flush function to reset the decoder state when seeking libgsm: simplify decoding by using a loop gsm: log error message when packet is too small libgsmdec: do not needlessly set *data_size to 0 gsmdec: do not needlessly set *data_size to 0 gsmdec: add flush function to reset the decoder state when seeking libgsmdec: check output buffer size before decoding gsmdec: log error message when output buffer is too small. ... Conflicts: Changelog ffplay.c libavcodec/indeo3.c libavcodec/mjpeg_parser.c libavcodec/vp3.c libavformat/cutils.c libavformat/id3v2.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use designated initialisers for parsers.Anton Khirnov2011-11-021-5/+5
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-211-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (47 commits) lavc: hide private symbols. lavc: deprecate img_get_alpha_info(). lavc: use avpriv_ prefix for ff_toupper4. lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits. lavc: use avpriv_ prefix for ff_ac3_parse_header. lavc: use avpriv_ prefix for ff_frame_rate_tab. lavc: rename ff_find_start_code to avpriv_mpv_find_start_code lavc: use avpriv_ prefix for ff_split_xiph_headers. lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header. lavc: use avpriv_ prefix for some dv symbols used in lavf. lavc: use avpriv_ prefix for some flac symbols used in lavf. lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf. lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf. lavc: use avpriv_ prefix for ff_aac_parse_header(). lavf: hide private symbols. lavf: use avpriv_ prefix for some dv functions. lavf: use avpriv_ prefix for ff_new_chapter(). avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2() avcodec: clarify documentation of CODEC_CAP_DELAY ... Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dv.c libavcodec/dvdata.c libavcodec/dvdata.h libavcodec/libspeexenc.c libavcodec/mpegvideo.c libavcodec/version.h libavformat/avidec.c libavformat/dv.c libavformat/dv.h libavformat/flvenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/oggparsespeex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use avpriv_ prefix for ff_aac_parse_header().Anton Khirnov2011-10-201-1/+1
| | | | | | | | It's used in lavf.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-281-1/+1
|/ | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c)
* Split the ADTS header decoder off of the ADTS parser.Alex Converse2010-07-121-44/+1
| | | | | | | The AAC decoder and ADTS-to-ASC BSF both require the header decoder but not full parsing capabilities. Originally committed as revision 24217 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add av_ prefix to bswap macrosMåns Rullgård2010-07-101-1/+1
| | | | Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
* bswap: change ME to NE in macro namesMåns Rullgård2010-07-101-1/+1
| | | | | | | Other parts of FFmpeg use NE (native endian) rather than ME (machine). This makes it consistent. Originally committed as revision 24169 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allow parsing and decoding of ADTS AAC files with channel config = 0Alex Converse2009-05-131-3/+0
| | | | Originally committed as revision 18815 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move the ADTS header size to the parser's header file.Alex Converse2009-05-131-5/+3
| | | | Originally committed as revision 18814 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename bitstream.h to get_bits.h.Stefano Sabatini2009-04-131-1/+1
| | | | Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Close the AAC parse context, discovered by Netgem.Alex Converse2009-02-231-1/+1
| | | | Originally committed as revision 17544 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correctly map ADTS profile_ObjectType to MPEG-4 AOTAlex Converse2009-02-131-1/+1
| | | | | | Patch by Alex Converse ( alex converse gmail com ) Originally committed as revision 17196 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-2/+2
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support ADTS AAC files in the ffaac decoder (limited to streams containing oneRobert Swain2009-01-071-32/+54
| | | | | | | | | raw_data_block() per ADTS frame) Patch by Alex Converse ( alex converse gmail com) based on a patch by Robert Swain ( robert swain gmail com ) Originally committed as revision 16485 to svn://svn.ffmpeg.org/ffmpeg/trunk
* AAC: fix strict aliasing violation in parserMåns Rullgård2008-12-171-3/+6
| | | | Originally committed as revision 16180 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aac_parser: fix strict aliasing violationMåns Rullgård2008-10-111-2/+3
| | | | Originally committed as revision 15595 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add new_frame_start and need_next_header.Michael Niedermayer2008-04-191-1/+4
| | | | | | based on a patch by Bartlomiej Originally committed as revision 12895 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change aac and ac3 parsers to use ff_combine_frame().Michael Niedermayer2008-04-191-3/+3
| | | | Originally committed as revision 12894 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove AACAC3FrameFlagMichael Niedermayer2008-04-181-2/+1
| | | | Originally committed as revision 12888 to svn://svn.ffmpeg.org/ffmpeg/trunk
* undo changes in aac_ac3_parserBartlomiej Wolowiec2008-04-091-6/+4
| | | | Originally committed as revision 12778 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Corrections of errors in aac_ac3_parserBartlomiej Wolowiec2008-04-071-1/+1
| | | | Originally committed as revision 12759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* change of aac_ac3_parser, so it is able to send complete portion of data to ↵Bartlomiej Wolowiec2008-04-051-4/+6
| | | | | | decoder Originally committed as revision 12758 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use mpeg4audio common code in aac parserBaptiste Coudurier2008-04-011-16/+5
| | | | Originally committed as revision 12665 to svn://svn.ffmpeg.org/ffmpeg/trunk
* removal of stream_type in AACAC3ParseContext and adding AACAC3FrameFlagBartlomiej Wolowiec2008-03-281-3/+2
| | | | Originally committed as revision 12622 to svn://svn.ffmpeg.org/ffmpeg/trunk
* adding lacking include to aac3_parser.cBartlomiej Wolowiec2008-03-241-0/+1
| | | | Originally committed as revision 12572 to svn://svn.ffmpeg.org/ffmpeg/trunk
* using EAC3_STREAM_TYPE_* instead of numbersBartlomiej Wolowiec2008-03-241-1/+1
| | | | Originally committed as revision 12571 to svn://svn.ffmpeg.org/ffmpeg/trunk
* using stream type in eac3 parserBartlomiej Wolowiec2008-03-241-0/+1
| | | | Originally committed as revision 12570 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Pass AACAC3ParseContext to sync() instead of individual arguments. Patch byJustin Ruggles2008-03-231-7/+6
| | | | | | Bartlomiej Wolowiec (bartek wolowiec gmail com) Originally committed as revision 12564 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Apply 'cold' attribute to init/uninit functions in libavcodecZuxy Meng2008-03-211-1/+1
| | | | Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
* prevent infinite loop and memcpy of negative amountsMichael Niedermayer2007-10-131-0/+3
| | | | | | fixes issue194 Originally committed as revision 10726 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: rename for consistency after previous aac and ac3 parsers moveAurelien Jacobs2007-05-081-3/+3
| | | | Originally committed as revision 8942 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move aac and ac3 parsers in their own filesAurelien Jacobs2007-05-081-0/+97
Originally committed as revision 8941 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status