diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 15:24:59 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 15:26:20 +0200 |
| commit | c01f1157acbec4274a38a728cf7fa9731ef23d82 (patch) | |
| tree | 72d4fd691fdab418e75e05963b4e2a7e86fb7539 /libavcodec | |
| parent | 82439dec0fbf8a31159327ddf57096a0013109b9 (diff) | |
| parent | 0f40c9098498ad90dbbd2380eb4269015e84bde4 (diff) | |
| download | ffmpeg-c01f1157acbec4274a38a728cf7fa9731ef23d82.tar.gz | |
Merge commit '0f40c9098498ad90dbbd2380eb4269015e84bde4'
* commit '0f40c9098498ad90dbbd2380eb4269015e84bde4':
Drop pointless assert.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ac3dsp.c | 1 | ||||
| -rw-r--r-- | libavcodec/ffv1.c | 1 | ||||
| -rw-r--r-- | libavcodec/libopusdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/vdpau.c | 17 |
4 files changed, 14 insertions, 7 deletions
diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c index fe87b5bde5..9902f905f0 100644 --- a/libavcodec/ac3dsp.c +++ b/libavcodec/ac3dsp.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "avcodec.h" #include "ac3.h" #include "ac3dsp.h" diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 537409e4ed..60eb523e45 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -32,6 +32,7 @@ #include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" #include "libavutil/timer.h" + #include "avcodec.h" #include "internal.h" #include "rangecoder.h" diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c index 1e97604181..bdc948c0c3 100644 --- a/libavcodec/libopusdec.c +++ b/libavcodec/libopusdec.c @@ -22,9 +22,9 @@ #include <opus.h> #include <opus_multistream.h> -#include "libavutil/avassert.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" + #include "avcodec.h" #include "internal.h" #include "vorbis.h" diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 057f907927..1d4c1ce743 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -22,19 +22,26 @@ */ #include <limits.h> -#include "libavutil/avassert.h" + #include "avcodec.h" #include "internal.h" #include "h264.h" #include "vc1.h" - -#undef NDEBUG -#include <assert.h> - #include "vdpau.h" #include "vdpau_compat.h" #include "vdpau_internal.h" +// XXX: at the time of adding this ifdefery, av_assert* wasn't use outside. +// When dropping it, make sure other av_assert* were not added since then. +#if FF_API_BUFS_VDPAU +#include "libavutil/avassert.h" +#endif + +#if FF_API_VDPAU +#undef NDEBUG +#include <assert.h> +#endif + /** * @addtogroup VDPAU_Decoding * |