| Index: media/filters/ffmpeg_video_decoder.cc
|
| diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
|
| index 81ddd8bee2e52e7a4fcf6c3f8d9908a381c23d88..41bd0e49f60c95da847132362fab7f2cdbd4dd24 100644
|
| --- a/media/filters/ffmpeg_video_decoder.cc
|
| +++ b/media/filters/ffmpeg_video_decoder.cc
|
| @@ -96,7 +96,7 @@ void FFmpegVideoDecoder::Initialize(const scoped_refptr<DemuxerStream>& stream,
|
| }
|
|
|
| // Initialize AVCodecContext structure.
|
| - codec_context_ = avcodec_alloc_context();
|
| + codec_context_ = avcodec_alloc_context3(NULL);
|
| VideoDecoderConfigToAVCodecContext(config, codec_context_);
|
|
|
| // Enable motion vector search (potentially slow), strong deblocking filter
|
| @@ -323,6 +323,9 @@ bool FFmpegVideoDecoder::Decode(
|
| // Let FFmpeg handle presentation timestamp reordering.
|
| codec_context_->reordered_opaque = buffer->GetTimestamp().InMicroseconds();
|
|
|
| + // Reset frame to default values.
|
| + avcodec_get_frame_defaults(av_frame_);
|
| +
|
| // This is for codecs not using get_buffer to initialize
|
| // |av_frame_->reordered_opaque|
|
| av_frame_->reordered_opaque = codec_context_->reordered_opaque;
|
|
|