diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:34:02 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:34:02 +0300 |
| commit | 6988cf2969d777ebac84d241123883357375dc6c (patch) | |
| tree | 8d1071655aa00c31b5491bd3065cdf9a17ad7204 /libavcodec/options.c | |
| parent | 97bdb94341ae60630f019f8fa057be9bb35c08c8 (diff) | |
| parent | 5f30ac27795f9f98043e8582ccaad8813104adc4 (diff) | |
Merge commit '5f30ac27795f9f98043e8582ccaad8813104adc4'
* commit '5f30ac27795f9f98043e8582ccaad8813104adc4':
lavc: deprecate avcodec_copy_context()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index ea2563b571..a82f3759a3 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -179,6 +179,7 @@ void avcodec_free_context(AVCodecContext **pavctx) av_freep(pavctx); } +#if FF_API_COPY_CONTEXT int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src) { const AVCodec *orig_codec = dest->codec; @@ -258,6 +259,7 @@ fail: av_opt_free(dest); return AVERROR(ENOMEM); } +#endif const AVClass *avcodec_get_class(void) { |