summaryrefslogtreecommitdiff
path: root/libavcodec/options.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-08-06 12:39:37 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-08-06 12:39:37 +0200
commita368920eefbfe3e741108e3b52ff0be69e8bd8c0 (patch)
tree6c0e55c0caca472e11149014ff95cba254a99234 /libavcodec/options.c
parent94c0df79c7e8205b9e0ae560bc4ac831c231abb8 (diff)
downloadffmpeg-a368920eefbfe3e741108e3b52ff0be69e8bd8c0.tar.gz
avcodec/options: Silence deprecated warning about coded_frame
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/options.c')
-rw-r--r--libavcodec/options.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 37f379245d..7154c9c4e7 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -213,7 +213,11 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
dest->slice_offset = NULL;
dest->hwaccel = NULL;
dest->internal = NULL;
+#if FF_API_CODED_FRAME
+FF_DISABLE_DEPRECATION_WARNINGS
dest->coded_frame = NULL;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
/* reallocate values that should be allocated separately */
dest->extradata = NULL;