mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-test.git
synced 2025-02-24 10:02:47 +00:00
28 lines
1.6 KiB
Diff
28 lines
1.6 KiB
Diff
diff -up chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.system-ffmpeg-3 chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
|
|
--- chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.system-ffmpeg-3 2016-03-03 21:02:35.000000000 +0100
|
|
+++ chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc 2016-03-07 02:24:07.937055548 +0100
|
|
@@ -15,9 +15,9 @@
|
|
#include <limits>
|
|
|
|
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 "webrtc/base/checks.h"
|
|
diff -up chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
|
|
--- chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 2016-03-03 21:02:35.000000000 +0100
|
|
+++ chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h 2016-03-07 02:24:04.729115509 +0100
|
|
@@ -15,7 +15,7 @@
|
|
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
|
|
|
|
extern "C" {
|
|
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
|
|
+#include <libavcodec/avcodec.h>
|
|
} // extern "C"
|
|
|
|
#include "webrtc/base/scoped_ptr.h"
|