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 /ffmpeg_vdpau.c | |
| 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 'ffmpeg_vdpau.c')
| -rw-r--r-- | ffmpeg_vdpau.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ffmpeg_vdpau.c b/ffmpeg_vdpau.c index cf2e83e8a3..d4b4bd6b41 100644 --- a/ffmpeg_vdpau.c +++ b/ffmpeg_vdpau.c @@ -27,7 +27,6 @@ #include "libavcodec/vdpau.h" -#include "libavutil/avassert.h" #include "libavutil/buffer.h" #include "libavutil/frame.h" #include "libavutil/hwcontext.h" |