summaryrefslogtreecommitdiff
path: root/libavcodec/adpcm.h
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/adpcmenc: remove BLKSIZE #defineZane van Iperen2020-10-171-2/+0
| | | | Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
* avcodec/adpcm_argo: add ff_adpcm_argo_expand_nibble() and cleanup parametersZane van Iperen2020-08-071-0/+2
| | | | | | Replaces adpcm_argo_expand_nibble(). Preparation for the encoder. Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
* Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch2016-06-211-1/+1
|\ | | | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
| * cosmetics: Fix spelling mistakesVittorio Giovara2016-05-041-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Correct few "ffmpeg" typosPaul B Mahol2014-08-241-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ADPCM DTK decoderJames Almer2013-05-101-2/+2
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-011-3/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) fate: add golomb-test golomb-test: K&R formatting cosmetics h264: Split h264-test off into a separate file - golomb-test.c. h264-test: cleanup: drop timer invocations, commented out code and other cruft h264-test: Remove unused DSP and AVCodec contexts and related init calls. adpcm: Add missing stdint.h #include to fix standalone header compilation. lavf: add functions for accessing the fourcc<->CodecID mapping tables. lavc: set AVCodecContext.codec in avcodec_get_context_defaults3(). lavc: make avcodec_close() work properly on unopened codecs. lavc: add avcodec_is_open(). lavf: rename AVInputFormat.value to raw_codec_id. lavf: remove the pointless value field from flv and iv8 lavc/lavf: remove unnecessary symbols from the symbol version script. lavc: reorder AVCodec fields. lavf: reorder AVInput/OutputFormat fields. mp3dec: Fix a heap-buffer-overflow adpcmenc: remove some unneeded casts adpcmenc: use int16_t and uint8_t instead of short and unsigned char. adpcmenc: fix adpcm_ms extradata allocation adpcmenc: return proper AVERROR codes instead of -1 ... Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/adpcmenc.c libavcodec/avcodec.h libavcodec/h264.c libavcodec/libavcodec.v libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/options.c libavformat/Makefile libavformat/avformat.h libavformat/flvdec.c libavformat/libavformat.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adpcm: Add missing stdint.h #include to fix standalone header compilation.Diego Biurrun2012-01-311-0/+2
| |
| * adpcmenc: use int16_t and uint8_t instead of short and unsigned char.Justin Ruggles2012-01-301-3/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-121-4/+4
|/ | | | | | | | | | | | | | | | | | | | | * qatar/master: adpcm: split ADPCM encoders and decoders into separate files. doc/avconv: fix typo. rv34: check that subsequent slices have the same type as first one. smacker demuxer: handle possible av_realloc() failure. lavfi: add split filter from soc. lavfi: add showinfo filter libxavs: add private options corresponding to deprecated global options Conflicts: Changelog libavcodec/adpcm.c libavfilter/avfilter.h libavfilter/vf_showinfo.c libavfilter/vf_split.c libavformat/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* adpcm: split ADPCM encoders and decoders into separate files.Justin Ruggles2011-09-121-0/+46
Move shared tables to a separate file as well.
View Lorry Controller Status