AI 146671: am: CL 146668 am: CL 146667 Add advice in MediaRecorder Java docs about using MPEG-4 container format
Original author: davidsparks
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146671
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 676f241..5d90e62 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -219,6 +219,10 @@
* Sets the format of the output file produced during recording. Call this
* after setAudioSource()/setVideoSource() but before prepare().
*
+ * <p>It is recommended to always use 3GP format when using the H.263
+ * video encoder and AMR audio encoder. Using an MPEG-4 container format
+ * may confuse some desktop players.</p>
+ *
* @param output_format the output format to use. The output format
* needs to be specified before setting recording-parameters or encoders.
* @throws IllegalStateException if it is called after prepare() or before
