From c2bd06e685eddd31431e7c0491edab59f705e3f3 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Wed, 5 Dec 2012 22:34:36 -0500
Subject: [PATCH] Updated fmpeg path on windows, took out the 'Optional' from
 the Path to Encoder on config page just to avoid some confusion

---
 data/interfaces/default/config.html | 2 +-
 headphones/music_encoder.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index 742ade22..58baf946 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -546,7 +546,7 @@
 				    </div>
 			    </div>
 				    <div class="row">
-    					    <label>Path to Encoder (Optional)</label>
+    					    <label>Path to Encoder</label>
     					    <input type="text" name="encoderfolder" value="${config['encoderfolder']}" size="43">
     					</div>
 				</td>
diff --git a/headphones/music_encoder.py b/headphones/music_encoder.py
index f0ede2bd..1f03aca7 100644
--- a/headphones/music_encoder.py
+++ b/headphones/music_encoder.py
@@ -98,7 +98,7 @@ def encode(albumPath):
                 encoder="lame"
         elif headphones.ENCODER =='ffmpeg':
             if headphones.SYS_PLATFORM == "win32":
-                encoder = "C:/Program Files/ffmpeg/ffmpeg.exe"
+                encoder = "C:/Program Files/ffmpeg/bin/ffmpeg.exe"
             else:
                 encoder="ffmpeg"