all: Port to GStreamer 1.0

11 files changed, 23 insertions, 20 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 6534dafa..7bd3fb18 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -22,11 +22,11 @@ desktop_in_files = rygel.desktop.in rygel-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-preset_DATA = $(srcdir)/presets/ffenc_aac.prs \
-	$(srcdir)/presets/ffenc_mp2.prs \
-	$(srcdir)/presets/ffenc_mpeg2video.prs \
-	$(srcdir)/presets/ffenc_wmav1.prs \
-	$(srcdir)/presets/ffenc_wmv1.prs \
+preset_DATA = $(srcdir)/presets/avenc_aac.prs \
+	$(srcdir)/presets/avenc_mp2.prs \
+	$(srcdir)/presets/avenc_mpeg2video.prs \
+	$(srcdir)/presets/avenc_wmav1.prs \
+	$(srcdir)/presets/avenc_wmv1.prs \
 	$(srcdir)/presets/GstFaac.prs \
 	$(srcdir)/presets/GstLameMP3Enc.prs \
 	$(srcdir)/presets/GstMP4Mux.prs \
diff --git a/data/presets/GstFaac.prs b/data/presets/GstFaac.prs
index 69894850..c02d4fa1 100644
--- a/data/presets/GstFaac.prs
+++ b/data/presets/GstFaac.prs
@@ -1,5 +1,5 @@
 [_presets_]
-version=0.10
+version=1.0
 element-name=GstFaac
 
 [Rygel DLNA preset]
@@ -7,3 +7,6 @@ bitrate=64000
 
 [Rygel AAC_ADTS_320 preset]
 bitrate=256000
+
+[Rygel AVC_MP4_BL_CIF15_AAC_520 preset]
+bitrate=256000
diff --git a/data/presets/GstLameMP3Enc.prs b/data/presets/GstLameMP3Enc.prs
index a80a10d2..fd66ea13 100644
--- a/data/presets/GstLameMP3Enc.prs
+++ b/data/presets/GstLameMP3Enc.prs
@@ -1,5 +1,5 @@
 [_presets_]
-version=0.10
+version=1.0
 element-name=GstLameMP3Enc
 
 [Rygel DLNA preset]
diff --git a/data/presets/GstMP4Mux.prs b/data/presets/GstMP4Mux.prs
index 8c54280f..c5a885c4 100644
--- a/data/presets/GstMP4Mux.prs
+++ b/data/presets/GstMP4Mux.prs
@@ -1,5 +1,5 @@
 [_presets_]
-version=0.10
+version=1.0
 element-name=GstMP4Mux
 
 [Rygel DLNA preset]
diff --git a/data/presets/GstTwoLame.prs b/data/presets/GstTwoLame.prs
index e8025298..7ad25230 100644
--- a/data/presets/GstTwoLame.prs
+++ b/data/presets/GstTwoLame.prs
@@ -1,5 +1,5 @@
 [_presets_]
-version=0.10
+version=1.0
 element-name=GstTwoLame
 
 [Rygel DLNA preset]
diff --git a/data/presets/GstX264Enc.prs b/data/presets/GstX264Enc.prs
index b126d36a..400717da 100644
--- a/data/presets/GstX264Enc.prs
+++ b/data/presets/GstX264Enc.prs
@@ -1,5 +1,5 @@
 [_presets_]
-version=0.10
+version=1.0
 element-name=GstX264Enc
 
 [Rygel AVC_MP4_BL_CIF15_AAC_520 preset]
diff --git a/data/presets/ffenc_aac.prs b/data/presets/avenc_aac.prs
index cd3838e3..0ea27d01 100644
--- a/data/presets/ffenc_aac.prs
+++ b/data/presets/avenc_aac.prs
@@ -1,6 +1,6 @@
 [_presets_]
-version=0.10
-element-name=ffenc_aac
+version=1.0
+element-name=wvenc_aac
 
 [Rygel DLNA preset]
 bitrate=64000
diff --git a/data/presets/ffenc_mp2.prs b/data/presets/avenc_mp2.prs
index 588af1b9..bb557bc0 100644
--- a/data/presets/ffenc_mp2.prs
+++ b/data/presets/avenc_mp2.prs
@@ -1,6 +1,6 @@
 [_presets_]
-version=0.10
-element-name=ffenc_mp2
+version=1.0
+element-name=avenc_mp2
 
 [Rygel DLNA preset]
 bitrate=256000
diff --git a/data/presets/ffenc_mpeg2video.prs b/data/presets/avenc_mpeg2video.prs
index 32a14d4e..bfd1f05a 100644
--- a/data/presets/ffenc_mpeg2video.prs
+++ b/data/presets/avenc_mpeg2video.prs
@@ -1,6 +1,6 @@
 [_presets_]
-version=0.10
-element-name=ffenc_mpeg2video
+version=1.0
+element-name=avenc_mpeg2video
 
 [Rygel DLNA preset]
 bitrate=1500000
diff --git a/data/presets/ffenc_wmav1.prs b/data/presets/avenc_wmav1.prs
index c28a00e7..736b002a 100644
--- a/data/presets/ffenc_wmav1.prs
+++ b/data/presets/avenc_wmav1.prs
@@ -1,6 +1,6 @@
 [_presets_]
-version=0.10
-element-name=ffenc_wmav1
+version=1.0
+element-name=avenc_wmav1
 
 [Rygel DLNA preset]
 bitrate=64000
diff --git a/data/presets/ffenc_wmv1.prs b/data/presets/avenc_wmv1.prs
index 6434df44..0a8319e9 100644
--- a/data/presets/ffenc_wmv1.prs
+++ b/data/presets/avenc_wmv1.prs
@@ -1,6 +1,6 @@
 [_presets_]
-version=0.10
-element-name=ffenc_wmv1
+version=1.0
+element-name=avenc_wmv1
 
 [Rygel DLNA preset]
 bitrate=1200000