diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-12 00:52:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-12 01:10:32 +0100 |
| commit | 794006f8fe403ccd2993513a8e4fbe885ef7f9fb (patch) | |
| tree | 42edca40fc6f5ba24543f611086891ae4c6b6f68 /libavcodec/gsmdec_data.h | |
| parent | 4093d130d1934edcd098014d306492173527f1f6 (diff) | |
| parent | e7d02b04dcfb65d1873b81bd3281442ac5ddec1d (diff) | |
| download | ffmpeg-794006f8fe403ccd2993513a8e4fbe885ef7f9fb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fft: init functions with INIT_XMM/YMM.
pcmenc: set frame_size to 0.
gsm demuxer: use generic seeking instead of a gsm-specific function.
gsm demuxer: return packets with only 1 gsm block at a time.
avcodec: add GSM parser
doc: Replace ffmpeg references in avserver config file by avconv.
doc: Fix names of av_log color environment variables.
Fix a bunch of platform name and other typos.
Add some missing changelog entries and release 0.8_beta2
No longer build libpostproc by default
wtv: fix memleaks during normal operation
threads: add CODEC_CAP_AUTO_THREADS for libvpx and xavs
Conflicts:
Changelog
RELEASE
cmdutils.c
configure
doc/ffserver.conf
doc/platform.texi
ffplay.c
libavcodec/Makefile
libavcodec/version.h
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsmdec_data.h')
| -rw-r--r-- | libavcodec/gsmdec_data.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/gsmdec_data.h b/libavcodec/gsmdec_data.h index 4e2c7e6846..3eb30b84b7 100644 --- a/libavcodec/gsmdec_data.h +++ b/libavcodec/gsmdec_data.h @@ -25,11 +25,6 @@ #include <stdint.h> #include "avcodec.h" -// input and output sizes in byte -#define GSM_BLOCK_SIZE 33 -#define GSM_MS_BLOCK_SIZE 65 -#define GSM_FRAME_SIZE 160 - typedef struct { AVFrame frame; // Contains first 120 elements from the previous frame |