summaryrefslogtreecommitdiffstats
path: root/libavcodec/gsmdec.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-031-5/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * gsm: log error message when packet is too smallJustin Ruggles2011-11-021-1/+3
| |
| * gsmdec: do not needlessly set *data_size to 0Justin Ruggles2011-11-021-1/+1
| |
| * gsmdec: add flush function to reset the decoder state when seekingJustin Ruggles2011-11-021-0/+8
| |
| * gsmdec: log error message when output buffer is too small.Justin Ruggles2011-11-021-2/+4
| | | | | | | | also return AVERROR(EINVAL) instead of -1
| * gsm: use av_get_bytes_per_sample() in frame_bytes calculationJustin Ruggles2011-11-021-1/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-301-16/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata. H.264: tweak some other x86 asm for Atom probe: Fix insane flow control. mpegts: remove invalid error check s302m: use nondeprecated audio sample format API lavc: use designated initialisers for all codecs. x86: cabac: add operand size suffixes missing from 6c32576 Conflicts: libavcodec/ac3enc_float.c libavcodec/flacenc.c libavcodec/frwu.c libavcodec/pictordec.c libavcodec/qtrleenc.c libavcodec/v210enc.c libavcodec/wmv2dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use designated initialisers for all codecs.Anton Khirnov2011-07-291-16/+12
| | | | | | | | It's more readable and less prone to breakage.
| * 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-2/+2
| | | | | | | | | | | | | | 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-2/+2
|/ | | | | | | | 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)
* Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini2010-11-121-1/+1
| | | | | | SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix GSM decoding: regular GSM and MSGSM do not use the sameReimar Döffinger2010-10-021-215/+4
| | | | | | | | bitstream endianness, so they cannot reuse the same code without a lot of function call overhead. Thus use templating to compile two different binaries. Originally committed as revision 25312 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Document how the ref_buf is used.Reimar Döffinger2010-07-271-0/+4
| | | | Originally committed as revision 24551 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add native GSM 06.10 audio decoder.Reimar Döffinger2010-07-101-0/+316
Originally committed as revision 24158 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud