ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon Aug 1 13:03:15 2016 -0300| [7c8bf2dc2ba02312e7bee8f7df7994c3d8587407] | committer: James Almer
Merge commit 'b24dafe10572254ff0decc18b0d7c3d3707d5a29' * commit 'b24dafe10572254ff0decc18b0d7c3d3707d5a29': lavc: drop unnecessary h264dec.h includes Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c8bf2dc2ba02312e7bee8f7df7994c3d8587407 --- libavcodec/h264_parser.c | 2 +- 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 81ccaab..20efdaa 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 dcf2a6a..84513be 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" ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
