summaryrefslogtreecommitdiffstats
path: root/libavcodec/adpcm_data.h
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | avcodec: add adpcm MTAF decoderPaul B Mahol2016-05-211-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Correct few "ffmpeg" typosPaul B Mahol2014-08-241-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/adpcm_data: fix const misplacementLukasz Marek2014-02-071-1/+1
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | ADPCM IMA WAV 2, 3 and 5 bits decoderPaul B Mahol2013-07-051-0/+4
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ADPCM IMA Dialogic decoderPaul B Mahol2012-11-241-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ADPCM AFC decoderPaul B Mahol2012-11-221-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-131-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: sws: implement MMX/SSE2/SSSE3/SSE4 versions for horizontal scaling. include stdint.h in adpcm_data.h mpeg12: reorder functions to avoid ugly forward declarations Fixed off by one packet size allocation in the smacker demuxer. Check for invalid packet size in the smacker demuxer. ape demuxer: fix segfault on memory allocation failure. xan: Add some buffer checks xan: Remove extra trailing newline Fixed size given to init_get_bits() in xan decoder. Conflicts: libavcodec/mpeg12.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * include stdint.h in adpcm_data.hJustin Ruggles2011-09-131-0/+2
| | | | | | | | fixes make checkheaders
* | 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/+37
Move shared tables to a separate file as well.
OpenPOWER on IntegriCloud