Index: media/filters/ffmpeg_demuxer.cc |
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc |
index be31709b05017603df7c655e6e06e417eaef997e..adfeb23f27c78ecd6948235183cca666dccbfe37 100644 |
--- a/media/filters/ffmpeg_demuxer.cc |
+++ b/media/filters/ffmpeg_demuxer.cc |
@@ -32,6 +32,9 @@ |
#include "media/filters/ffmpeg_bitstream_converter.h" |
#include "media/filters/ffmpeg_glue.h" |
#include "media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h" |
+#if defined(ENABLE_HEVC_DEMUXING) |
+#include "media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.h" |
+#endif |
#include "media/filters/webvtt_util.h" |
#include "media/formats/webm/webm_crypto_helpers.h" |
@@ -460,6 +463,11 @@ void FFmpegDemuxerStream::InitBitstreamConverter() { |
if (stream_->codec->codec_id == AV_CODEC_ID_H264) { |
bitstream_converter_.reset( |
new FFmpegH264ToAnnexBBitstreamConverter(stream_->codec)); |
+#if defined(ENABLE_HEVC_DEMUXING) |
+ } else if (stream_->codec->codec_id == AV_CODEC_ID_HEVC) { |
ddorwin
2015/02/23 20:00:49
Do you expect FFmpeg to be built with such support
servolk
2015/02/24 02:15:13
Possibly. At the moment none of the ffmpeg_brandin
|
+ bitstream_converter_.reset( |
+ new FFmpegH265ToAnnexBBitstreamConverter(stream_->codec)); |
+#endif |
} else if (stream_->codec->codec_id == AV_CODEC_ID_AAC) { |
bitstream_converter_.reset( |
new FFmpegAACBitstreamConverter(stream_->codec)); |