diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:05:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:05:00 +0100 |
| commit | 5459cf411412c7a1d2da7ce6a6955c7d57490a55 (patch) | |
| tree | 18117251ae2ca34fd6895998f9699ef09855427a /libavcodec/gsmdec_data.h | |
| parent | d88e674a15dc23ca6bb68173dbb7c12e5d668bb5 (diff) | |
| parent | a8ea936a0a00570f61a16a588821b52f6a3115c2 (diff) | |
Merge commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2'
* commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2':
libilbc: decode directly to the user-provided AVFrame
dpcm: decode directly to the user-provided AVFrame
imc/iac: decode directly to the user-provided AVFrame
gsm: decode directly to the user-provided AVFrame
Conflicts:
libavcodec/dpcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsmdec_data.h')
| -rw-r--r-- | libavcodec/gsmdec_data.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/gsmdec_data.h b/libavcodec/gsmdec_data.h index 082c65d4b1..fd89ed63ee 100644 --- a/libavcodec/gsmdec_data.h +++ b/libavcodec/gsmdec_data.h @@ -26,7 +26,6 @@ #include "avcodec.h" typedef struct GSMContext { - AVFrame frame; // Contains first 120 elements from the previous frame // (used by long_term_synth according to the "lag"), // then in the following 160 elements the current |