mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-test.git
synced 2025-02-23 17:42:45 +00:00
28 lines
1.5 KiB
Diff
28 lines
1.5 KiB
Diff
diff -up chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.system-ffmpeg-3 chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
|
|
--- chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.system-ffmpeg-3 2016-03-22 23:02:39.000000000 +0100
|
|
+++ chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc 2016-03-23 18:51:16.810699343 +0100
|
|
@@ -15,9 +15,9 @@
|
|
#include <memory>
|
|
|
|
extern "C" {
|
|
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
|
|
-#include "third_party/ffmpeg/libavformat/avformat.h"
|
|
-#include "third_party/ffmpeg/libavutil/imgutils.h"
|
|
+#include <libavcodec/avcodec.h>
|
|
+#include <libavformat/avformat.h>
|
|
+#include <libavutil/imgutils.h>
|
|
} // extern "C"
|
|
|
|
#include "api/video/color_space.h"
|
|
diff -up chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
|
|
--- chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 2016-03-23 18:55:39.080894319 +0100
|
|
+++ chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h 2016-03-23 18:54:32.178123691 +0100
|
|
@@ -17,7 +17,7 @@
|
|
// passed to ffmpeg.
|
|
|
|
extern "C" {
|
|
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
|
|
+#include <libavcodec/avcodec.h>
|
|
} // extern "C"
|
|
|
|
#include "common_video/h264/h264_bitstream_parser.h"
|