From de1e368d8ac5891e03e664a0ea385b896b48db0b Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Tue, 5 Jan 2016 15:21:14 -0800
Subject: stagefright: Forward-port HFR and HSR support

 * CAF commit bd42a7ac3a60c0d8a079b4567484c9b006bac8ad upstream

Change-Id: I457ccab603647f3139ea2199a544f64ac3d1a214
---
 media/libmediaplayerservice/StagefrightRecorder.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'media/libmediaplayerservice/StagefrightRecorder.h')

diff --git a/media/libmediaplayerservice/StagefrightRecorder.h b/media/libmediaplayerservice/StagefrightRecorder.h
index 72dc77b..d93fc3b 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.h
+++ b/media/libmediaplayerservice/StagefrightRecorder.h
@@ -154,8 +154,8 @@ protected:
     status_t setupCameraSource(sp<CameraSource> *cameraSource);
     status_t setupAudioEncoder(const sp<MediaWriter>& writer);
     virtual status_t setupVideoEncoder(sp<MediaSource> cameraSource, sp<MediaSource> *source);
-    virtual void setupCustomVideoEncoderParams(sp<MediaSource> /*cameraSource*/,
-            sp<AMessage> &/*format*/) {}
+    virtual void setupCustomVideoEncoderParams(sp<MediaSource> cameraSource,
+            sp<AMessage> &format);
     virtual bool setCustomVideoEncoderMime(const video_encoder videoEncoder, sp<AMessage> format);
 
     // Encoding parameter handling utilities
-- 
cgit v1.1