Chromium Code Reviews Chromium Code Reviews
Issue 9317107:
FFmpeg merge diff after patches. (Closed)
Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> | 2 * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> |
| 3 * | 3 * |
| 4 * This file is part of FFmpeg. | 4 * This file is part of FFmpeg. |
| 5 * | 5 * |
| 6 * FFmpeg is free software; you can redistribute it and/or | 6 * FFmpeg is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Lesser General Public | 7 * modify it under the terms of the GNU Lesser General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2.1 of the License, or (at your option) any later version. | 9 * version 2.1 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 82 | 82 |
| 83 #ifndef av_flatten | 83 #ifndef av_flatten |
| 84 #if AV_GCC_VERSION_AT_LEAST(4,1) | 84 #if AV_GCC_VERSION_AT_LEAST(4,1) |
| 85 # define av_flatten __attribute__((flatten)) | 85 # define av_flatten __attribute__((flatten)) |
| 86 #else | 86 #else |
| 87 # define av_flatten | 87 # define av_flatten |
| 88 #endif | 88 #endif |
| 89 #endif | 89 #endif |
| 90 | 90 |
| 91 #ifndef attribute_deprecated | 91 #ifndef attribute_deprecated |
| 92 #if AV_GCC_VERSION_AT_LEAST(3,1) | 92 // TODO(dalecurtis): Revert once http://crbug.com/112673 is fixed. |
|
DaleCurtis
2012/02/04 18:06:20
See bug, I was able to remove all but one of the d
| |
| 93 # define attribute_deprecated __attribute__((deprecated)) | 93 //#if AV_GCC_VERSION_AT_LEAST(3,1) |
| 94 #else | 94 //# define attribute_deprecated __attribute__((deprecated)) |
| 95 //#else | |
| 95 # define attribute_deprecated | 96 # define attribute_deprecated |
| 96 #endif | 97 //#endif |
| 97 #endif | 98 #endif |
| 98 | 99 |
| 99 /** | 100 /** |
| 100 * Disable warnings about deprecated features | 101 * Disable warnings about deprecated features |
| 101 * This is useful for sections of code kept for backward compatibility and | 102 * This is useful for sections of code kept for backward compatibility and |
| 102 * scheduled for removal. | 103 * scheduled for removal. |
| 103 */ | 104 */ |
| 104 #ifndef AV_NOWARN_DEPRECATED | 105 #ifndef AV_NOWARN_DEPRECATED |
| 105 #if AV_GCC_VERSION_AT_LEAST(4,6) | 106 #if AV_GCC_VERSION_AT_LEAST(4,6) |
| 106 # define AV_NOWARN_DEPRECATED(code) \ | 107 # define AV_NOWARN_DEPRECATED(code) \ |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 153 | 154 |
| 154 #ifdef __GNUC__ | 155 #ifdef __GNUC__ |
| 155 # define av_builtin_constant_p __builtin_constant_p | 156 # define av_builtin_constant_p __builtin_constant_p |
| 156 # define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf __, fmtpos, attrpos))) | 157 # define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf __, fmtpos, attrpos))) |
| 157 #else | 158 #else |
| 158 # define av_builtin_constant_p(x) 0 | 159 # define av_builtin_constant_p(x) 0 |
| 159 # define av_printf_format(fmtpos, attrpos) | 160 # define av_printf_format(fmtpos, attrpos) |
| 160 #endif | 161 #endif |
| 161 | 162 |
| 162 #endif /* AVUTIL_ATTRIBUTES_H */ | 163 #endif /* AVUTIL_ATTRIBUTES_H */ |
| OLD | NEW |
