summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4audio.h
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: aac_latm: reconfigure decoder on audio specific config changes latmdec: fix audio specific config parsing Add avcodec_decode_audio4(). avcodec: change number of plane pointers from 4 to 8 at next major bump. Update developers documentation with coding conventions. svq1dec: avoid undefined get_bits(0) call ARM: h264dsp_neon cosmetics ARM: make some NEON macros reusable Do not memcpy raw video frames when using null muxer fate: update asf seektest vp8: flush buffers on size changes. doc: improve general documentation for MacOSX asf: use packet dts as approximation of pts asf: do not call av_read_frame rtsp: Initialize the media_type_mask in the rtp guessing demuxer Cleaned up alacenc.c Conflicts: doc/APIchanges doc/developer.texi libavcodec/8svx.c libavcodec/aacdec.c libavcodec/ac3dec.c libavcodec/avcodec.h libavcodec/nellymoserdec.c libavcodec/tta.c libavcodec/utils.c libavcodec/version.h libavcodec/wmadec.c libavformat/asfdec.c tests/ref/seek/lavf_asf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * latmdec: fix audio specific config parsingJanne Grunau2011-12-03
| | | | | | | | | | | | | | | | | | Pass the correct size in bits to mpeg4audio_get_config and add a flag to disable parsing of the sync extension when the size is not known. Latm with AudioMuxVersion 0 does not specify the size of the audio specific config. Data after the audio specific config can be misinterpreted as sync extension resulting in random and wrong configs.
* | 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 some mpeg4audio symbols used in lavf.Anton Khirnov2011-10-20
| | | | | | | | | | Specifically, ff_mpeg4audio_sample_rates, ff_mpeg4audio_get_config and ff_copy_pce_data
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fifo: add FIFO API test program, and fate test fifo: add av_fifo_peek2(), and deprecate av_fifo_peek() postprocess.c: filter name needs to be double 0 terminated doxygen: fix wrong comment syntax, //< vs. ///< doxygen: drop pointless star from pointer variable names Replace deprecated av_find_stream_info() by avformat_find_stream_info(). xmv: eliminate superfluous zeroing of zero data configure: fix typo in avconv dependency list Conflicts: configure doc/APIchanges libavutil/Makefile libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: fix wrong comment syntax, //< vs. ///<Diego Biurrun2011-08-26
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * aacdec: Implement LTP support.Young Han Lee2011-02-14
| | | | | | | | Ported from gsoc svn.
* | aacdec: Implement LTP support.Young Han Lee2011-02-15
|/ | | | | Ported from gsoc svn. (cherry picked from commit ead15f1dc196ad164d105e31c8c9025f8a4ee4e7)
* Add support for PS sync extensions.Alex Converse2010-04-08
| | | | Originally committed as revision 22818 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add an HE-AAC v1 decoder.Alex Converse2010-03-08
| | | | | | | | | A large portion of this code was orignally authored by Robert Swain. The rest was written by me. Full history is available at: svn://svn.ffmpeg.org/soc/aac-sbr http://github.com/aconverse/ffmpeg-heaac/tree/sbr_pub Originally committed as revision 22316 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Mark AOT_ALS as a supported MPEG-4 audio object type.Alex Converse2009-11-12
| | | | Originally committed as revision 20524 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: Remove the implied gap before AOT_USAC in the MPEG-4 AOT enum.Alex Converse2009-11-11
| | | | Originally committed as revision 20514 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
* Add Low Delay MPEG Surround to the enum of MPEG-4 Audio Object Types.Alex Converse2009-11-11
| | | | Originally committed as revision 20510 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Mark the AOT escape value as supported.Alex Converse2009-08-17
| | | | Originally committed as revision 19662 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add USAC and SAOC AOTs to the AudioObjectType enum.Alex Converse2009-08-17
| | | | Originally committed as revision 19661 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
* Fix typo in AOT_ER_AAC_ELDAlex Converse2009-03-18
| | | | Originally committed as revision 18034 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update the MPEG-4 AOT table.Alex Converse2009-03-18
| | | | Originally committed as revision 18033 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move MPEG-4 AOT enum to mpeg4audio.h.Alex Converse2009-03-18
| | | | Originally committed as revision 18031 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-31
| | | | | | | | | Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 02:42:07 +0000