summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4audio.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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_copy_bits and align_put_bits.Anton Khirnov2011-10-20
| | | | | | | | They are used in lavf.
| * lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.Anton Khirnov2011-10-20
| | | | | | | | | | Specifically, ff_mpeg4audio_sample_rates, ff_mpeg4audio_get_config and ff_copy_pce_data
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Add HE-AAC v2 support to the AAC decoder.Alex Converse2010-06-19
| | | | Originally committed as revision 23647 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for PS sync extensions.Alex Converse2010-04-08
| | | | Originally committed as revision 22818 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use get_bits_left() in the sync extension check.Alex Converse2010-04-08
| | | | Originally committed as revision 22817 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix ext_object_type.Alex Converse2010-04-08
| | | | | | | In the case of explicit non-backwards compible PS, the extension object type should be set to SBR. See 14496-3:2009 (fourth edition). Originally committed as revision 22816 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for non-backwards compatible signaled parametric stereo.Alex Converse2010-03-07
| | | | | | | | | This is done without breaking W6132 Annex YYYY draft MP3onMP4 which also uses AOT 29. Samples: http://samples.mplayerhq.hu/A-codecs/AAC/aacPlusDecoderCheckPackage_v2.1/bitstreams/File7.3gp http://samples.mplayerhq.hu/MPEG-4/mp3on4/id5_1.mp4 Originally committed as revision 22281 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use get_bits_left() instead of size_in_bits - get_bits_count().Ronald S. Bultje2009-11-16
| | | | Originally committed as revision 20543 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add the ability to parse the ALSSpecificConfig from an MPEG-4 ↵Thilo Borgmann2009-11-11
| | | | | | | | AudioSpecificConfig. Patch by Thilo Borgmann <com googlemail borgmann thilo> as part of GSoC 2009. Originally committed as revision 20516 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a channels field to MPEG4AudioConfig.Alex Converse2009-11-11
| | | | Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use the AOT enum instead of integer literals for setting and comparing audioAlex Converse2009-08-17
| | | | | | object types. Originally committed as revision 19666 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace 5 with AOT_SBR when referring to the MPEG-4 audio object type.Justin Ruggles2009-08-03
| | | | Originally committed as revision 19569 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Subroutine to copy an AAC Program Config Element (PCE)Alex Converse2009-05-13
| | | | Originally committed as revision 18817 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Read extended channel configuration when extended AOT is BSAC.Jai Menon2009-04-21
| | | | Originally committed as revision 18644 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename bitstream.h to get_bits.h.Stefano Sabatini2009-04-13
| | | | Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
* init ext sample rate to 0 if not presentBaptiste Coudurier2009-03-22
| | | | Originally committed as revision 18139 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mpeg4audio common codeBaptiste Coudurier2008-04-01
Originally committed as revision 12662 to svn://svn.ffmpeg.org/ffmpeg/trunk