diff -p -up arista-0.9.7/arista-gtk.nofaac arista-0.9.7/arista-gtk
--- arista-0.9.7/arista-gtk.nofaac 2011-06-20 16:10:53.000000000 +0200
+++ arista-0.9.7/arista-gtk 2012-06-20 21:48:28.275420026 +0200
@@ -1585,7 +1585,7 @@ class AddDialog(object):
"bitrate=192000"
],
"container": "mp4mux",
- "name": "faac",
+ "name": "voaacenc",
"depth": [
8,
24
@@ -1738,7 +1738,7 @@ class PresetDialog(gobject.GObject):
"FLV / Spark / H.263": "ffenc_flv",
}
ENCODER_TO_ACODEC = {
- "faac": "AAC",
+ "voaacenc": "AAC",
"lame": "MP3",
"vorbisenc": "Vorbis",
"ffenc_ac3": "AC-3",
@@ -1747,7 +1747,7 @@ class PresetDialog(gobject.GObject):
}
ACODEC_TO_ENCODER = {
"Vorbis": "vorbisenc",
- "AAC": "faac",
+ "AAC": "voaacenc",
"MP3": "lame",
"AC-3": "ffenc_ac3",
"FLAC": "flacenc",
@@ -2203,7 +2203,7 @@ class PresetDialog(gobject.GObject):
self.preset.acodec.name = self.ACODEC_TO_ENCODER[acodec]
self.audio_options.set_text({
"Vorbis": "quality=0.5",
- "AAC": "profile=4 bitrate=128000",
+ "AAC": "bitrate=128000",
"MP3": "vbr=new vbr-quality=4",
"FLAC": "quality=6",
"MP2": "bitrate=192",
diff -p -up arista-0.9.7/presets/android.json.nofaac arista-0.9.7/presets/android.json
--- arista-0.9.7/presets/android.json.nofaac 2011-06-14 16:12:13.000000000 +0200
+++ arista-0.9.7/presets/android.json 2012-06-20 21:44:52.186282197 +0200
@@ -35,7 +35,7 @@
]
},
"acodec": {
- "name": "faac",
+ "name": "voaacenc",
"container": "mp4mux",
"width": [
8,
@@ -54,7 +54,7 @@
2
],
"passes": [
- "bitrate=128000 profile=LC"
+ "bitrate=128000"
]
}
},
@@ -83,7 +83,7 @@
]
},
"acodec": {
- "name": "faac",
+ "name": "voaacenc",
"container": "mp4mux",
"width": [
8,
@@ -102,7 +102,7 @@
2
],
"passes": [
- "bitrate=128000 profile=LC"
+ "bitrate=128000"
]
}
},
@@ -132,7 +132,7 @@
]
},
"acodec": {
- "name": "faac",
+ "name": "voaacenc",
"container": "mp4mux",
"width": [
8, 16
@@ -147,7 +147,7 @@
1, 2
],
"passes": [
- "bitrate=128000 profile=LC"
+ "bitrate=128000"
]
}
},
@@ -176,7 +176,7 @@
]
},
"acodec": {
- "name": "faac",
+ "name": "voaacenc",
"container": "mp4mux",
"width": [
8,
@@ -195,7 +195,7 @@
2
],
"passes": [
- "bitrate=128000 profile=LC"
+ "bitrate=128000"
]
}
},
@@ -225,7 +225,7 @@
]
},
"acodec": {
- "name": "faac",
+ "name": "voaacenc",
"container": "mp4mux",
"width": [
8, 24
@@ -240,7 +240,7 @@
1, 2
],
"passes": [
- "bitrate=131072 profile=LC"
+ "bitrate=131072"
]
}
},
@@ -270,7 +270,7 @@
]
},
"acodec": {
- "name": "faac",
+ "name": "voaacenc",
"container": "mp4mux",
"width": [
8, 32
diff -p -up arista-0.9.7/presets/apple.json.nofaac arista-0.9.7/presets/apple.json
--- arista-0.9.7/presets/apple.json.nofaac 2011-06-17 16:03:25.000000000 +0200
+++ arista-0.9.7/presets/apple.json 2012-06-20 21:44:52.201282069 +0200
@@ -34,10 +34,10 @@
"icon": "file://ipad.svg",
"acodec": {
"passes": [
- "bitrate=128000 profile=LC"
+ "bitrate=128000"
],
"container": "qtmux",
- "name": "faac",
+ "name": "voaacenc",
"depth": [
8,
24
@@ -82,10 +82,10 @@
"icon": "file://ipod-video.svg",
"acodec": {
"passes": [
- "bitrate=128000 profile=LC"
+ "bitrate=128000"
],
"container": "qtmux",
- "name": "faac",
+ "name": "voaacenc",
"depth": [
8,
24
@@ -130,10 +130,10 @@
"icon": "file://ipod-iphone.svg",
"acodec": {
"passes": [
- "bitrate=128000 profile=LC"
+ "bitrate=128000"
],
"container": "qtmux",
- "name": "faac",
+ "name": "voaacenc",
"depth": [
8,
24
@@ -178,10 +178,10 @@
"icon": "file://ipod-nano.svg",
"acodec": {
"passes": [
- "bitrate=128000 profile=LC"
+ "bitrate=128000"
],
"container": "qtmux",
- "name": "faac",
+ "name": "voaacenc",
"depth": [
8,
24
diff -p -up arista-0.9.7/presets/computer.json.nofaac arista-0.9.7/presets/computer.json
--- arista-0.9.7/presets/computer.json.nofaac 2011-06-14 19:26:10.000000000 +0200
+++ arista-0.9.7/presets/computer.json 2012-06-20 21:44:52.214281956 +0200
@@ -40,7 +40,7 @@
"bitrate=192000"
],
"container": "mp4mux",
- "name": "faac",
+ "name": "voaacenc",
"depth": [
8,
24
@@ -88,7 +88,7 @@
"bitrate=192000"
],
"container": "mp4mux",
- "name": "faac",
+ "name": "voaacenc",
"depth": [
8,
24
diff -p -up arista-0.9.7/presets/nokia-nseries.json.nofaac arista-0.9.7/presets/nokia-nseries.json
--- arista-0.9.7/presets/nokia-nseries.json.nofaac 2011-05-27 18:02:30.000000000 +0200
+++ arista-0.9.7/presets/nokia-nseries.json 2012-06-20 21:44:52.229281827 +0200
@@ -81,10 +81,10 @@
"extension": "m4v",
"acodec": {
"passes": [
- "bitrate=96000 profile=LC"
+ "bitrate=96000"
],
"container": "qtmux",
- "name": "faac",
+ "name": "voaacenc",
"depth": [
8,
24
@@ -126,10 +126,10 @@
"icon": "file://nokia-n900.svg",
"acodec": {
"passes": [
- "bitrate=128000 profile=LC"
+ "bitrate=128000"
],
"container": "qtmux",
- "name": "faac",
+ "name": "voaacenc",
"depth": [
8,
24
@@ -174,7 +174,7 @@
]
},
"acodec": {
- "name": "faac",
+ "name": "voaacenc",
"container": "qtmux",
"width": [
8, 32
@@ -189,7 +189,7 @@
1, 2
],
"passes": [
- "bitrate=131072 profile=LC"
+ "bitrate=131072"
]
}
}
diff -p -up arista-0.9.7/presets/playstation.json.nofaac arista-0.9.7/presets/playstation.json
--- arista-0.9.7/presets/playstation.json.nofaac 2011-06-16 18:48:15.000000000 +0200
+++ arista-0.9.7/presets/playstation.json 2012-06-20 21:44:52.247281671 +0200
@@ -34,10 +34,10 @@
"icon": "file://psp.svg",
"acodec": {
"passes": [
- "bitrate=131072 profile=LC"
+ "bitrate=131072"
],
"container": "mp4mux",
- "name": "faac",
+ "name": "voaacenc",
"depth": [
8,
16
@@ -82,10 +82,10 @@
"icon": "file://ps3.svg",
"acodec": {
"passes": [
- "bitrate=196000 profile=LC"
+ "bitrate=196000"
],
"container": "qtmux",
- "name": "faac",
+ "name": "voaacenc",
"depth": [
8,
24
diff -p -up arista-0.9.7/presets/web.json.nofaac arista-0.9.7/presets/web.json
--- arista-0.9.7/presets/web.json.nofaac 2011-06-14 19:38:23.000000000 +0200
+++ arista-0.9.7/presets/web.json 2012-06-20 21:44:52.262281543 +0200
@@ -33,7 +33,7 @@
]
},
"acodec": {
- "name": "faac",
+ "name": "voaacenc",
"container": "flvmux",
"width": [
8, 24
@@ -48,7 +48,7 @@
1, 2
],
"passes": [
- "bitrate=131072 profile=LC"
+ "bitrate=131072"
]
}
},
@@ -74,7 +74,7 @@
]
},
"acodec": {
- "name": "faac",
+ "name": "voaacenc",
"container": "mp4mux faststart=1",
"width": [
8, 24
@@ -89,7 +89,7 @@
1, 2
],
"passes": [
- "bitrate=131072 profile=LC"
+ "bitrate=131072"
]
}
},
distrib
>
Mageia
>
3
>
i586
>
media
>
core-release-src
>
by-pkgid
>
e97a99c71950e8742fec8e2b31eae340
>
files
>
1
