X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_audio_stream.cc;h=1b0d39db27902cf6ac87459c90b5c35ecd1f9249;hb=4285355ff2bec853924647f0523d121860fe64e3;hp=31cbe260953d38c5693af767a855b8dd40dc41dd;hpb=3db1df492e1009ee28641cdc593a139df156e8d7;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc
index 31cbe2609..1b0d39db2 100644
--- a/src/lib/ffmpeg_audio_stream.cc
+++ b/src/lib/ffmpeg_audio_stream.cc
@@ -1,29 +1,31 @@
 /*
     Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "ffmpeg_audio_stream.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 
 using std::string;
 using boost::optional;
+using dcp::raw_convert;
 
 FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version)
 	: FFmpegStream (node)
@@ -37,6 +39,7 @@ FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version)
 	if (f) {
 		first_audio = ContentTime (f.get ());
 	}
+	codec_name = node->optional_string_child("CodecName");
 }
 
 void
@@ -49,4 +52,7 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const
 	if (first_audio) {
 		root->add_child("FirstAudio")->add_child_text (raw_convert<string> (first_audio.get().get ()));
 	}
+	if (codec_name) {
+		root->add_child("CodecName")->add_child_text (codec_name.get());
+	}
 }