Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(802)

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: 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:
View side-by-side diff with in-line comments
Download patch
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..571a461b7ecdce88ddd326a6a296581f3e7ccf91 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -43,7 +43,9 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
// Callback called from within FFmpeg to allocate a buffer based on
// the dimensions of |codec_context|. See AVCodecContext.get_buffer
wolenetz 2014/05/16 19:45:58 nit: s/get_buffer/get_buffer2/
DaleCurtis 2014/05/20 01:13:45 Done.
// documentation inside FFmpeg.
- int GetVideoBuffer(AVCodecContext *codec_context, AVFrame* frame);
+ int GetVideoBuffer(struct AVCodecContext* codec_context,
wolenetz 2014/05/16 19:45:58 Curious - why not just static in .cc like FFmpegAu
wolenetz 2014/05/20 22:37:10 Never mind: this is needed for video since the obj
+ AVFrame* frame,
+ int flags);
private:
enum DecoderState {

Powered by Google App Engine
This is Rietveld 408576698