media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc - Issue 286953005: Roll FFmpeg for M37.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc

Issue 286953005: Roll FFmpeg for M37. (Closed) Base URL: https://chromium.googlesource.com/chromium/src

Patch Set: Final DEPS. Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc

diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc

index 320362f5479e5eadce9bb45f6d35e28d476261ca..942dce11e8ec38e22440270247728daabfcef8af 100644

--- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc

+++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc

@@ -226,7 +226,7 @@ cdm::Status FFmpegCdmVideoDecoder::DecodeFrame(

codec_context_->reordered_opaque = timestamp;

// Reset frame to default values.

- avcodec_get_frame_defaults(av_frame_.get());

+ av_frame_unref(av_frame_.get());

wolenetz 2014/05/20 22:37:10 ditto: unref prior to first decode looks wrong to

DaleCurtis 2014/05/20 23:00:45 Ditto.

// This is for codecs not using get_buffer to initialize

// |av_frame_->reordered_opaque|