summaryrefslogtreecommitdiffstats
path: root/libavcodec/msgsmdec.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0'Michael Niedermayer2013-11-261-1/+1
|\ | | | | | | | | | | | | | | | | | | * commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0': MSN Audio support Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * MSN Audio supportKostya Shishkov2013-11-261-1/+1
| | | | | | | | | | | | | | This is essentially a MS GSM decoder extension that supports more sampling rates and lower bitrates. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-221-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: get rid of the -vglobal option. dct32: Add AVX implementation of 32-point DCT dct32: Change pass 6 permutation to allow for AVX implementation dct32: port SSE 32-point DCT to YASM multiple inclusion guard cleanup avio: document buffer must created with av_malloc() and friends avio: check AVIOContext malloc failure swscale: point out an alternative to sws_getContext svq3: Do initialization after parsing the extradata add changelog entries for 0.7_beta2 mp3lame: add #include required for AV_RB32 macro. Conflicts: Changelog libavcodec/svq3.c libavcodec/x86/dct32_sse.c libavfilter/vsrc_buffer.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * multiple inclusion guard cleanupDiego Biurrun2011-05-211-3/+3
| | | | | | | | | | Add missing multiple inclusion guards; clean up #endif comments; add missing library prefixes; keep guard names consistent.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Fix headers so that "make checkheaders" passes againMartin Storsjö2010-10-081-0/+2
| | | | Originally committed as revision 25411 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix GSM decoding: regular GSM and MSGSM do not use the sameReimar Döffinger2010-10-021-0/+28
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
OpenPOWER on IntegriCloud