diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:04:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:04:16 +0100 |
| commit | e052f06531c400a845092a7e425ef97834260b3b (patch) | |
| tree | 85324d9b7c63a360d5a02e8d2018d1a176db1452 /libavcodec/libvo-amrwbenc.c | |
| parent | eba6a04e1c9c802186f14b93671dd3137ae6bea8 (diff) | |
| parent | 0f24a3ca999a702f83af9307f9f47b6fdeb546a5 (diff) | |
Merge commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5'
* commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5':
lavc: remove disabled FF_API_OLD_ENCODE_VIDEO cruft
lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
lavc: remove disabled FF_API_OLD_DECODE_AUDIO cruft
Conflicts:
libavcodec/flacenc.c
libavcodec/libgsm.c
libavcodec/utils.c
libavcodec/version.h
The compatibility wrapers are left as they likely sre still
in wide use. They will be removed when they break or otherwise
cause work without an volunteer being available.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libvo-amrwbenc.c')
| -rw-r--r-- | libavcodec/libvo-amrwbenc.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c index 4294374482..a068cd009d 100644 --- a/libavcodec/libvo-amrwbenc.c +++ b/libavcodec/libvo-amrwbenc.c @@ -94,11 +94,6 @@ static av_cold int amr_wb_encode_init(AVCodecContext *avctx) avctx->frame_size = 320; avctx->delay = 80; -#if FF_API_OLD_ENCODE_AUDIO - avctx->coded_frame = avcodec_alloc_frame(); - if (!avctx->coded_frame) - return AVERROR(ENOMEM); -#endif s->state = E_IF_init(); @@ -110,7 +105,6 @@ static int amr_wb_encode_close(AVCodecContext *avctx) AMRWBContext *s = avctx->priv_data; E_IF_exit(s->state); - av_freep(&avctx->coded_frame); return 0; } |