From 0fc53f6e370f44e3e7bb34e3a793bc92c20cdd73 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 20 Apr 2016 07:44:47 -0700
Subject: [PATCH] Fix Flac test + bring v2 fully in sync (I think!).
 ------------- Created by MOE: https://github.com/google/moe
 MOE_MIGRATED_REVID=120335929

---
 extensions/flac/src/main/jni/flac_jni.cc                        | 2 +-
 .../android/exoplayer/extractor/ExtractorSampleSource.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/flac/src/main/jni/flac_jni.cc b/extensions/flac/src/main/jni/flac_jni.cc
index 7fe1887971..7b8cdf5bc9 100644
--- a/extensions/flac/src/main/jni/flac_jni.cc
+++ b/extensions/flac/src/main/jni/flac_jni.cc
@@ -89,7 +89,7 @@ FUNC(jobject, flacDecodeMetadata, jlong jContext) {
       context->parser->getStreamInfo();
 
   jclass cls = env->FindClass(
-      "com/google/android/exoplayer/ext/flac/"
+      "com/google/android/exoplayer/util/"
       "FlacStreamInfo");
   jmethodID constructor = env->GetMethodID(cls, "<init>", "(IIIIIIIJ)V");
 
diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java b/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java
index 580d10960f..253564e561 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java
@@ -52,7 +52,7 @@ import java.util.List;
  * <li>MP4, including M4A ({@link com.google.android.exoplayer.extractor.mp4.Mp4Extractor})</li>
  * <li>fMP4 ({@link com.google.android.exoplayer.extractor.mp4.FragmentedMp4Extractor})</li>
  * <li>Matroska and WebM ({@link com.google.android.exoplayer.extractor.mkv.MatroskaExtractor})</li>
- * <li>Ogg Vorbis ({@link com.google.android.exoplayer.extractor.ogg.OggVorbisExtractor}</li>
+ * <li>Ogg Vorbis/FLAC ({@link com.google.android.exoplayer.extractor.ogg.OggExtractor}</li>
  * <li>MP3 ({@link com.google.android.exoplayer.extractor.mp3.Mp3Extractor})</li>
  * <li>AAC ({@link com.google.android.exoplayer.extractor.ts.AdtsExtractor})</li>
  * <li>MPEG TS ({@link com.google.android.exoplayer.extractor.ts.TsExtractor})</li>