media/filters/ffmpeg_video_decoder.h - 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/filters/ffmpeg_video_decoder.h

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

Patch Set: Roll DEPS for ChromiumOS fixes. 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/filters/ffmpeg_video_decoder.h

diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h

index c8481a24f92229b53459e76e59ede5f6d797699e..ced6ddf2eabc8e23b6b6b5bfea25643202a6e8b8 100644

--- a/media/filters/ffmpeg_video_decoder.h

+++ b/media/filters/ffmpeg_video_decoder.h

@@ -41,9 +41,11 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {

virtual void Stop() OVERRIDE;

// Callback called from within FFmpeg to allocate a buffer based on

- // the dimensions of |codec_context|. See AVCodecContext.get_buffer

+ // the dimensions of |codec_context|. See AVCodecContext.get_buffer2

// documentation inside FFmpeg.

- int GetVideoBuffer(AVCodecContext *codec_context, AVFrame* frame);

+ int GetVideoBuffer(struct AVCodecContext* codec_context,

+ AVFrame* frame,

+ int flags);

private:

enum DecoderState {