| Age | Commit message (Collapse) | Author |
|---|
|
* commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c':
mpeg4audio: check the init_get_bits() return value
Conflicts:
libavcodec/mpeg4audio.c
See: deefdf9788467edd262b9c29a4f6e33d2ae84b8c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Fixes possible invalid reads.
CC:libav-stable@libav.org
|
|
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
This is a workaround until a better solution is found.
|
|
Fixes Ticket1049
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Fixes bug170
Bug found by: Gautam Gupta
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* 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>
|
|
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.
|
|
* 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>
|
|
They are used in lavf.
|
|
Specifically, ff_mpeg4audio_sample_rates, ff_mpeg4audio_get_config and
ff_copy_pce_data
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
Originally committed as revision 23647 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 22818 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 22817 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
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
|
|
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
|
|
Originally committed as revision 20543 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
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
|
|
Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
object types.
Originally committed as revision 19666 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 19569 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18817 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18644 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18139 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 12662 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
