diff -w --normal folder1/mkisofs.c folder2/mkisofs.c
220d219
< int	dvd_audio = 0;
375,377c374
< #define	OPTION_DVD_VIDEO		1501
< #define	OPTION_DVD_AUDIO		1502
< #define	OPTION_DVD_HYBRID		1503
---
> #define	OPTION_DVD			1501
625c622
< 	{{"dvd-video", no_argument, NULL, OPTION_DVD_VIDEO},
---
> 	{{"dvd-video", no_argument, NULL, OPTION_DVD},
627,630d623
< 	{{"dvd-audio", no_argument, NULL, OPTION_DVD_AUDIO},
< 	'\0', NULL, "Generate DVD-Audio compliant UDF file system", ONE_DASH},
< 	{{"dvd-hybrid", no_argument, NULL, OPTION_DVD_HYBRID},
< 	'\0', NULL, "Generate DVD-Hybrid compliant UDF file system", ONE_DASH},
1820c1813
< 		case OPTION_DVD_VIDEO:
---
> 		case OPTION_DVD:
1824,1835d1816
< 
< 		case OPTION_DVD_AUDIO:
< 			use_udf++;
< 			dvd_audio++;
< 			break;
< 
< 		case OPTION_DVD_HYBRID:
< 			use_udf++;
< 			dvd_video++;
< 			dvd_audio++;
< 			break;
< 
2313c2294
< 	if ((dvd_video || dvd_audio) && use_Joliet) {
---
> 	if (dvd_video && use_Joliet) {
2315c2296
< 		error("Warning: Disabling Joliet support for DVD-Video/DVD-Audio/DVD-Hybrid.\n");
---
> 		error("Warning: Disabling Joliet support for DVD-Video.\n");
diff -w --normal folder1/mkisofs.h folder2/mkisofs.h
368,369d367
< extern int	dvd_audio;
< 
diff -w --normal folder1/tree.c folder2/tree.c
1819c1819
< 	if (dvd_video || dvd_audio ) {
---
> 	if (dvd_video) {
diff -w --normal folder1/udf.c folder2/udf.c
1436,1450d1435
<  * /AUDIO_TS/AUDIO_PP.IFO   21210
<  * /AUDIO_TS/AUDIO_TS.IFO   21209
<  * /AUDIO_TS/AUDIO_TS.VOB   21208
<  * /AUDIO_TS/AUDIO_TS.BUP   21200
<  * /AUDIO_TS/AUDIO_SV.IFO   21199
<  * /AUDIO_TS/AUDIO_SV.VOB   21198
<  * /AUDIO_TS/AUDIO_SV.BUP   21188
<  * /AUDIO_TS/ATS_01_0.IFO   21187
<  * /AUDIO_TS/ATS_01_0.VOB   21186
<  *            :               :
<  * /AUDIO_TS/ATS_01_9.VOB   21177
<  * /AUDIO_TS/ATS_01_0.BUP   21176
<  *            :               :
<  * /AUDIO_TS/ATS_99_0.BUP   20000
<  *
1473d1457
< 	int amg_number;
1481d1464
< 		amg_number = 0;
1485d1467
< 		amg_number = 0;
1488,1491d1469
< 	} else if (memcmp(name, "AUDIO_PP", 8) == 0) {
< 		amg_number = 2;
< 		ts_number = 0;
< 		audio = 1;
1493,1497d1470
< 		amg_number = 1;
< 		ts_number = 0;
< 		audio = 1;
< 	} else if (memcmp(name, "AUDIO_SV", 8) == 0) {
< 		amg_number = 0;
1501d1473
< 		amg_number = 0;
1509,1510c1481
< 	    ((strcmp(this_dir->de_name, "VIDEO_TS") != 0) &&
< 	    (strcmp(this_dir->de_name, "AUDIO_TS") != 0)))
---
> 	    strcmp(this_dir->de_name, "VIDEO_TS") != 0)
1528c1499
< 		return (audio * 10000 - ts_number * 12 + amg_number * 10 - segment + 11198);
---
> 		return (audio * 10000 - ts_number * 12 - segment + 11198);
1530c1501
< 		return (audio * 10000 - ts_number * 12 + amg_number * 10 + 11199);
---
> 		return (audio * 10000 - ts_number * 12 + 11199);
1532c1503
< 		return (audio * 10000 - ts_number * 12 + amg_number * 10 + 11188);
---
> 		return (audio * 10000 - ts_number * 12 + 11188);
diff -w --normal folder1/write.c folder2/write.c
581d580
< #define	dvd_audio	0
588c587
< #if	defined(APPLE_HYB) || defined(DVD_VIDEO) || defined(DVD_HYBRID)
---
> #if	defined(APPLE_HYB) || defined(DVD_VIDEO)
590c589
< 		if (apple_hyb || dvd_video || dvd_audio ) {
---
> 		if (apple_hyb || dvd_video) {
995c994
< 		if (dvd_video || dvd_audio ) {
---
> 		if (dvd_video) {