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/libgsm.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/libgsm.c')
| -rw-r--r-- | libavcodec/libgsm.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index 66fe0ae1b1..16fbb0ebda 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -41,9 +41,6 @@ #include "gsm.h" static av_cold int libgsm_encode_close(AVCodecContext *avctx) { -#if FF_API_OLD_ENCODE_AUDIO - av_freep(&avctx->coded_frame); -#endif gsm_destroy(avctx->priv_data); avctx->priv_data = NULL; return 0; @@ -88,12 +85,6 @@ static av_cold int libgsm_encode_init(AVCodecContext *avctx) { } } -#if FF_API_OLD_ENCODE_AUDIO - avctx->coded_frame= avcodec_alloc_frame(); - if (!avctx->coded_frame) - goto error; -#endif - return 0; error: libgsm_encode_close(avctx); |