| Index: media/ffmpeg/ffmpeg_common.h
|
| diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
|
| index fa5dfee1dd5ef332101d3abbd5c96a74a04f2463..56a8a94285bf04d657691b65caece44e28657f1f 100644
|
| --- a/media/ffmpeg/ffmpeg_common.h
|
| +++ b/media/ffmpeg/ffmpeg_common.h
|
| @@ -37,7 +37,11 @@ extern "C" {
|
| // Temporarily disable possible loss of data warning.
|
| // TODO(scherkus): fix and upstream the compiler warnings.
|
| MSVC_PUSH_DISABLE_WARNING(4244);
|
| +// Temporarily disable "parenthesized type followed by an initializer list is a
|
| +// non-standard"
|
| +MSVC_PUSH_DISABLE_WARNING(4576);
|
| #include <libavcodec/avcodec.h>
|
| +#include <libavcodec/internal.h>
|
| #include <libavformat/avformat.h>
|
| #include <libavformat/internal.h>
|
| #include <libavformat/avio.h>
|
| @@ -47,6 +51,7 @@ MSVC_PUSH_DISABLE_WARNING(4244);
|
| #include <libavutil/mathematics.h>
|
| #include <libavutil/opt.h>
|
| MSVC_POP_WARNING();
|
| +MSVC_POP_WARNING();
|
| } // extern "C"
|
|
|
| namespace media {
|
| @@ -79,6 +84,11 @@ inline void ScopedPtrAVFreeFrame::operator()(void* x) const {
|
| av_frame_free(&frame);
|
| }
|
|
|
| +inline void ScopedPtrAVFreeParserContext::operator()(void* x) const {
|
| + AVCodecParserContext* parser = static_cast<AVCodecParserContext*>(x);
|
| + av_parser_close(parser);
|
| +}
|
| +
|
| // Converts an int64_t timestamp in |time_base| units to a base::TimeDelta.
|
| // For example if |timestamp| equals 11025 and |time_base| equals {1, 44100}
|
| // then the return value will be a base::TimeDelta for 0.25 seconds since that
|
|
|