diff options
| author | James Almer <jamrial@gmail.com> | 2016-08-01 19:03:15 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-08-01 19:03:15 +0300 |
| commit | 7c8bf2dc2ba02312e7bee8f7df7994c3d8587407 (patch) | |
| tree | 25d4a7cbe1877561040b95bdf99d5fd6b7d95eb3 /libavcodec | |
| parent | 9ee1f033656374a9f7c9bddcfd85739614580d62 (diff) | |
| parent | b24dafe10572254ff0decc18b0d7c3d3707d5a29 (diff) | |
Merge commit 'b24dafe10572254ff0decc18b0d7c3d3707d5a29'
* commit 'b24dafe10572254ff0decc18b0d7c3d3707d5a29':
lavc: drop unnecessary h264dec.h includes
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_parser.c | 2 | ||||
| -rw-r--r-- | libavcodec/qsvenc_h264.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 81ccaabc1e..20efdaaa7d 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -36,10 +36,10 @@ #include "libavutil/mem.h" #include "libavutil/pixfmt.h" +#include "avcodec.h" #include "get_bits.h" #include "golomb.h" #include "h264.h" -#include "h264dec.h" #include "h264_sei.h" #include "h264_ps.h" #include "h264data.h" diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index dcf2a6a56e..84513bec54 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -26,11 +26,11 @@ #include <mfx/mfxvideo.h> +#include "libavutil/common.h" #include "libavutil/opt.h" #include "avcodec.h" #include "internal.h" -#include "h264dec.h" #include "qsv.h" #include "qsv_internal.h" #include "qsvenc.h" |