>>>>>>> afde02615be844cf56a6c4f88485f426d2fa457c
		String rendererMencoderOptions = params.mediaRenderer.getCustomMencoderOptions(); // default: empty string
		String globalMencoderOptions = configuration.getMencoderCustomOptions(); // default: empty string

<<<<<<< HEAD
		String combinedCustomOptions = defaultString(globalMencoderOptions)
			+ " "
			+ defaultString(rendererMencoderOptions);
=======
		String combinedCustomOptions = defaultString(globalMencoderOptions) +
			" " +
			defaultString(rendererMencoderOptions);

		if (!combinedCustomOptions.contains("-lavdopts")) {
			add = " -lavdopts debug=0";

		String rendererMencoderOptions = params.mediaRenderer.getCustomMencoderOptions(); // default: empty string
		String globalMencoderOptions = configuration.getMencoderCustomOptions(); // default: empty string

		String combinedCustomOptions = defaultString(globalMencoderOptions) +
			" " +
			defaultString(rendererMencoderOptions);

		if (!combinedCustomOptions.contains("-lavdopts")) {
			add = " -lavdopts debug=0";