aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-11-02 17:54:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-03-26 09:42:45 +0200
commite00d6e80ff62d151fb9c20336ee365ca42854a69 (patch)
treec62cf39d0092c29c9c6c46b55e4ceb8bbcabbf4c
parentf682094aaab8f7c0a1a728c0d39d14fe52121aa0 (diff)
downloadffmpeg-e00d6e80ff62d151fb9c20336ee365ca42854a69.tar.gz
avcodec: Remove a misplaced and useless attribute_deprecated
If attribute_deprecated is used in an enum declaration, it should follow the 'enum' keyword, otherwise it's ignored silently. This is the only case of attribute_deprecated for enum declarations currently. Currently, this attribute_deprecated doesn't have any effect. If moved to the right place, it emits a warning every single time avcodec.h is included, like this: avcodec.h:2827: warning: ‘AVLPCType’ is deprecated (declared at avcodec.h:543) There is already a working attribute_deprecated for the corresponding field in AVCodecContext, so therefore this one shouldn't be needed. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 1b6da627d49e98fe7661c9aa9ec4e16ab04dfda4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/avcodec.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 51c2c2a4b3..10c628862c 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -544,7 +544,7 @@ enum AVChromaLocation{
/**
* LPC analysis type
*/
-attribute_deprecated enum AVLPCType {
+enum AVLPCType {
AV_LPC_TYPE_DEFAULT = -1, ///< use the codec default LPC type
AV_LPC_TYPE_NONE = 0, ///< do not use LPC prediction or use all zero coefficients
AV_LPC_TYPE_FIXED = 1, ///< fixed LPC coefficients