From b439b7e8315bbd733910a37f546d529199f07f20 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Wed, 12 Dec 2012 16:10:50 +0100
Subject: [PATCH] Fix #1023 : Some subdef options are not saved correctly
 (audio samplerate, GOP)

---
 lib/classes/databox/subdef.class.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/classes/databox/subdef.class.php b/lib/classes/databox/subdef.class.php
index 9af5e629d8..084f901512 100644
--- a/lib/classes/databox/subdef.class.php
+++ b/lib/classes/databox/subdef.class.php
@@ -304,7 +304,19 @@ class databox_subdef
      */
     protected function buildAudioSubdef(SimpleXMLElement $sd)
     {
-        return new Audio();
+        $audio = new Audio();
+
+        if ($sd->acodec) {
+            $audio->setOptionValue(Audio::OPTION_ACODEC, (string) $sd->acodec);
+        }
+        if ($sd->bitrate) {
+            $audio->setOptionValue(Audio::OPTION_BITRATE, (int) $sd->bitrate);
+        }
+        if ($sd->audiosamplerate) {
+            $audio->setOptionValue(Audio::OPTION_AUDIOSAMPLERATE, (int) $sd->audiosamplerate);
+        }
+
+        return $audio;
     }
 
     /**
@@ -363,6 +375,12 @@ class databox_subdef
         if ($sd->bitrate) {
             $video->setOptionValue(Video::OPTION_BITRATE, (int) $sd->bitrate);
         }
+        if ($sd->audiosamplerate) {
+            $video->setOptionValue(Video::OPTION_AUDIOSAMPLERATE, (int) $sd->audiosamplerate);
+        }
+        if ($sd->GOPsize) {
+            $video->setOptionValue(Video::OPTION_GOPSIZE, (int) $sd->GOPsize);
+        }
 
         return $video;
     }