summaryrefslogtreecommitdiff
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-28 16:38:04 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-28 16:42:32 +0000
commitb986a4625d0e67710f155a9816dbab186a98020e (patch)
tree118c89f94a652571276175a55de0f4b21e00faea /libavcodec/avcodec.h
parentc79252897096b89376bcf17a5bca6cdf8d21b6a0 (diff)
parent1482aff2048511b821ff9feac19426113cc641a2 (diff)
Merge commit '1482aff2048511b821ff9feac19426113cc641a2'
* commit '1482aff2048511b821ff9feac19426113cc641a2': lavc: Move noise_reduction to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 60a7808fe1..346573f5ef 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2107,14 +2107,11 @@ typedef struct AVCodecContext {
/** @deprecated use encoder private options instead */
attribute_deprecated
int scenechange_threshold;
-#endif
- /**
- * noise reduction strength
- * - encoding: Set by user.
- * - decoding: unused
- */
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
int noise_reduction;
+#endif
#if FF_API_MPV_OPT
/**