summaryrefslogtreecommitdiff
path: root/libavcodec/mpegaudio_parser.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-02
| |
* | 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 mpegaudio symbols used in lavf.Anton Khirnov2011-10-20
| | | | | | | | | | Specifically, ff_mpa_freq_tab, ff_mpa_bitrate_tab, ff_mpa_decode_header, ff_mpegaudio_decode_header.
* | mpegaudio_parser: be less picky on the start positionMichael Niedermayer2011-06-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: make executable again LATM/AAC: Free previously initialized context on reinit. configure: Do not unconditionally add -Wall to host CFLAGS. configure: Set OS/2 objformat to a.out. Add support for a.out object format to assembler macros. fate: disable threading for encoding fate: add comment field fate: allow overriding default build and install dirs mpegtsenc: Add an AVClass pointer to the private data mpegaudio: clean up #includes mpegaudio: move all header parsing to mpegaudiodecheader.[ch] Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegaudio: clean up #includesMans Rullgard2011-05-20
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegaudio: move all header parsing to mpegaudiodecheader.[ch]Mans Rullgard2011-05-20
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: qdm2: Use floating point synthesis filter. h264: correct border check. h264: fix loopfilter with threading at slice boundaries. Fix ff_mpa_synth_filter_fixed() prototype Rename costablegen.c ---> cos_tablegen.c. Collapse tableprint.c into tableprint.h. Simplify trig table rules Remove potentially unstable filenames from comments in generated files. Ignore generated tables and generated table generator programs. Simplify CLEANFILES make variable by using wildcards. Remove silly insults from avformat_version() Doxygen documentation. mpegaudiodsp: fix x86 and ppc makefiles configure: Adjust AVX assembler check. mpegaudio: remove unused version of SAME_HEADER_MASK mpegaudio: remove useless #undef at end of file asfdec: add missing #include for av_bswap32() mpegaudio: merge two #if CONFIG_FLOAT blocks mpegaudio: move some struct definitions from mpegaudio.h Move some mpegaudio functions to new mpegaudiodsp subsystem Conflicts: libavcodec/h264.c libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegaudio: remove unused version of SAME_HEADER_MASKMans Rullgard2011-05-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | 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-26
| | | | | | | | | | | | | | 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-28
|/ | | | | | | | 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)
* Cleanup properly at the end of MPEG Audio parsing.Art Clarke2009-07-02
| | | | | | Patch by Art Clarke (aclarke AT xuggle com) Originally committed as revision 19327 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rewrite mp3 parser. New code is much simpler and does not dropMichael Niedermayer2009-06-30
| | | | | | stuff at random. Originally committed as revision 19300 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: Fix indentation after r18741.Carl Eugen Hoyos2009-05-05
| | | | Originally committed as revision 18742 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not discard mp3 frames in the parser after a broken frame.Michael Niedermayer2009-05-05
| | | | | | | Fixes issue1044. This may cause regressions with broken streams, if you find any, please report! Originally committed as revision 18741 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add missing av_cold in static init/close functions.Daniel Verkamp2009-02-22
| | | | | | Patch by Daniel Verkamp daniel at drv dot nu. Originally committed as revision 17526 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Avoid allocating MPADecodeContext on stack.Andreas Öman2009-01-23
| | | | | | | Instead move relevant fields into MPADecodeHeader and use it where appropriate. Originally committed as revision 16728 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-19
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Let the mpeg audio parser correct the codec_id.Michael Niedermayer2009-01-13
| | | | Originally committed as revision 16582 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add dummy mp1_decoder to complement the existing dummy mp2/mp3 decoders.Michael Niedermayer2009-01-13
| | | | Originally committed as revision 16581 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change mpeg audio parser so it only sets frame_size, channels and bit_rateMichael Niedermayer2008-12-21
| | | | | | | after it has a few valid frames. Fixes issue762 Originally committed as revision 16259 to svn://svn.ffmpeg.org/ffmpeg/trunk
* indentMåns Rullgård2007-07-08
| | | | Originally committed as revision 9553 to svn://svn.ffmpeg.org/ffmpeg/trunk
* set sample rate in more logical place, kill warningMåns Rullgård2007-07-08
| | | | Originally committed as revision 9552 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use AV_xx throughout libavcodecRamiro Polla2007-06-02
| | | | Originally committed as revision 9169 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add a ff_ prefix to some mpegaudio funcsAurelien Jacobs2007-05-20
| | | | Originally committed as revision 9081 to svn://svn.ffmpeg.org/ffmpeg/trunk
* loosen dependencies over mpegaudiodecAurelien Jacobs2007-05-20
| | | | Originally committed as revision 9080 to svn://svn.ffmpeg.org/ffmpeg/trunk
* make some parser parameters const to avoid casting const to non-constAurelien Jacobs2007-05-07
| | | | Originally committed as revision 8921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* avoid a 'discards qualifiers from pointer' warningAurelien Jacobs2007-05-05
| | | | Originally committed as revision 8900 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move mpegaudio_parser in it's own fileAurelien Jacobs2007-05-05
Originally committed as revision 8899 to svn://svn.ffmpeg.org/ffmpeg/trunk