--- ffx264-3.8.3.old/ffx264
+++ ffx264-3.8.3/ffx264
@@ -549,12 +549,12 @@
 				;;
 			esac
 			case "$1" in
-				mp4) 		green "-> ac3|eac3|dts|aac|fdk-aac|mp3|vorbis|flac|copy" ;;
-				mov) 		green "-> ac3|eac3|dts|aac|fdk-aac|mp3|vorbis|alac|copy" ;;
-				m4v) 		green "-> ac3|aac|fdk-aac|alac|copy" ;;
-				avi)		green "-> ac3|eac3|dts|aac|fdk-aac|mp3|vorbis|pcm|flac|wmav1|wmav2|copy" ;;
-				flv)		green "-> aac|fdk-aac|mp3|copy" ;;
-				ts|mts|m2ts)	green "-> ac3|eac3|truehd|dts|aac|fdk-aac|mp3|vorbis|flac|copy" ;;
+				mp4) 		green "-> ac3|eac3|dts|aac|mp3|vorbis|flac|copy" ;;
+				mov) 		green "-> ac3|eac3|dts|aac|mp3|vorbis|alac|copy" ;;
+				m4v) 		green "-> ac3|aac|alac|copy" ;;
+				avi)		green "-> ac3|eac3|dts|aac|mp3|vorbis|pcm|flac|wmav1|wmav2|copy" ;;
+				flv)		green "-> aac|mp3|copy" ;;
+				ts|mts|m2ts)	green "-> ac3|eac3|truehd|dts|aac|mp3|vorbis|flac|copy" ;;
 				other)
 				error "-> H.264 video not supported by the $i container!"
 				error "-> Supported containers are: mkv, mp4, mov, m4v, m2ts, mts, ts, flv and avi"
@@ -2219,11 +2219,6 @@
 			abropts[i]="32-512"
 			abrdef[i]="448"
 			;;
-			fdk*)
-			acdc[i]="libfdk_aac"
-			abropts[i]="8-512"
-			abrdef[i]="320"
-			;;
 			mp3)
 			acdc[i]="libmp3lame"
 			ameta[i]="MP3"
@@ -2352,21 +2347,6 @@
 		
 		if [ "${acodec[i]}" != "copy" ]; then
 			case "${acodec[i]}" in
-				fdk*)
-				printf "Track $i: Which AAC Profile to Use? [LC/HE/HEv2/LD - default is LC]: "
-				read aprof[i]
-				case "${aprof[i]}" in
-					lc|LC|"")	ameta[i]="LC-AAC"; aacprof[i]="aac_low" ;;
-					he|HE)		ameta[i]="HE-AACv1"; aacprof[i]="aac_he" ;;
-					hev2|HEv2|HEV2)	ameta[i]="HE-AACv2"; aacprof[i]="aac_he_v2" ;;
-					ld|LD)		ameta[i]="LD-AAC"; aacprof[i]="aac_ld" ;;
-					*)
-					error "- Invalid AAC profile!"
-					exit 1
-					;;
-				esac
-				audprofile[i]="-profile:a:${audindex[i]} ${aacprof[i]} -afterburner:a:${audindex[i]} 1"
-				;;
 				flac|alac)
 				test "${acodec[i]}" = "flac" && cdcname[i]="FLAC" || cdcname[i]="ALAC"
 				printf "Track $i: Specify the ${cdcname[i]} Compression Level [${abropts[i]} - default is ${abrdef[i]}]: "
@@ -2391,7 +2371,7 @@
 			esac
 			
 			case "${acodec[i]}" in
-				ac3|eac3|truehd|dts|aac|fdk*|mp3|vorbis|libopus|opus|wmav1|wmav2|"")
+				ac3|eac3|truehd|dts|aac|mp3|vorbis|libopus|opus|wmav1|wmav2|"")
 				printf "Track $i: Specify the Audio Bitrate in kbps [${abropts[i]} - default is ${abrdef[i]}]: "
 				read abr[i]
 				test -z "${abr[i]}" && abitrate[i]="${abrdef[i]}k" || abitrate[i]="${abr[i]}k"
@@ -2406,7 +2386,6 @@
 				mp3|opus|wmav1|wmav2)			chanrange[i]="1-2"; defchan[i]="2" ;;
 				truehd)					chanrange[i]="2/5/6"; defchan[i]="6" ;;
 				dts)					chanrange[i]="1/2/4/5/6"; defchan[i]="6" ;;
-				fdk*)
 				case "${aacprof[i]}" in
 					aac_low|aac_he|aac_ld)		chanrange[i]="1-8"; defchan[i]="8" ;;
 					*)				chanrange[i]="1-2"; defchan[i]="2" ;;
@@ -2448,28 +2427,6 @@
 					;;
 				esac
 				;;
-				fdk*)
-				case "${aacprof[i]}" in
-					aac_he_v2)
-					case "${ach[i]}" in
-						1|2) true ;;
-						*)
-						error "-> HE-AACv2 supports only 1-2 channels!"
-						exit 1
-						;;
-					esac
-					;;
-					*)
-					case "${ach[i]}" in
-						[1-6]|8) true ;;
-						*)
-						error "-> libfdk_aac encoder supports only 1, 2, 3, 4, 5, 6 and 8 channels!"
-						exit 1
-						;;
-					esac
-					;;
-				esac
-				;;
 				mp3|opus|wmav1|wmav2)
 				case "${ach[i]}" in
 					1|2) true ;;
@@ -2572,29 +2529,6 @@
 					;;
 				esac
 				;;
-				fdk*)
-				echo " 0 -> Mono     4 -> 5.0"
-				echo " 1 -> Stereo   5 -> 5.1"
-				echo " 2 -> 3.0      6 -> 7.1"
-				echo " 3 -> 4.0      7 -> 7.1(wide)"
-				echo
-				printf "Track $i: Specify the Audio Channel Layout [default is 6]: "
-				read achanlayout[i]
-				case "${achanlayout[i]}" in
-					0)	achlayout[i]="mono"; achmeta[i]="Mono" ;;
-					1)	achlayout[i]="stereo"; achmeta[i]="Stereo" ;;
-					2)	achlayout[i]="3.0"; achmeta[i]="3.0" ;;
-					3)	achlayout[i]="4.0"; achmeta[i]="4.0" ;;
-					4)	achlayout[i]="5.0"; achmeta[i]="5.0" ;;
-					5)	achlayout[i]="5.1"; achmeta[i]="5.1" ;;
-					6|"")	achlayout[i]="7.1"; achmeta[i]="7.1" ;;
-					7)	achlayout[i]="7.1(wide)"; achmeta[i]="7.1(wide)" ;;
-					*)
-					error "-> Invalid option!"
-					exit 1
-					;;
-				esac
-				;;
 				vorbis)
 				echo " 0 -> Mono     4 -> Quad(side)   8 --> 5.1(side)"
 				echo " 1 -> Stereo   5 -> 5.0          9 --> 6.1"
@@ -2869,7 +2803,7 @@
 							;;
 						esac
 						;;
-						aac|fdk*)
+						aac)
 						echo " 0 -> 7350 Hz     5 -> 22050 Hz    10 -> 64000 Hz"
 						echo " 1 -> 8000 Hz     6 -> 24000 Hz    11 -> 88200 Hz"
 						echo " 2 -> 11025 Hz    7 -> 32000 Hz    12 -> 96000 Hz"