Projects >> UniversalMediaServer >>3c0c68b9218e88af16dc7f041470ff111906d08a

Chunk
Conflicting content 
	 * @return a {@link List} of Strings representing the FFmpeg output parameters for the renderer according
	 * to its TranscodeVideo profile.
	 */
<<<<<<< HEAD
	public List getTranscodeVideoOptions(RendererConfiguration renderer, DLNAMediaInfo media, OutputParams params) {
=======
	public List getTranscodeVideoOptions(RendererConfiguration renderer, DLNAMediaInfo media, OutputParams params, String fileName) {
>>>>>>> b2582111ab649040c807832100ddb86177b197df
		List transcodeOptions = new ArrayList<>();

		if (renderer.isTranscodeToWMV()) { // WMV
Solution content 
	 * @return a {@link List} of Strings representing the FFmpeg output parameters for the renderer according
	 * to its TranscodeVideo profile.
	 */
	public List getTranscodeVideoOptions(RendererConfiguration renderer, DLNAMediaInfo media, OutputParams params, String fileName) {
		List transcodeOptions = new ArrayList<>();

		if (renderer.isTranscodeToWMV()) { // WMV
File
FFMpegVideo.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
		return getDefaultArgs(); // unused; return this array for for backwards compatibility
	}

<<<<<<< HEAD
	private List getCustomArgs() {
		String customOptionsString = configuration.getFfmpegSettings();

		if (StringUtils.isNotBlank(customOptionsString)) {
			LOGGER.debug("Custom ffmpeg output options: {}", customOptionsString);
		}

		String[] customOptions = StringUtils.split(customOptionsString);
		return new ArrayList<>(Arrays.asList(customOptions));
	}

=======
>>>>>>> b2582111ab649040c807832100ddb86177b197df
	// XXX hardwired to false and not referenced anywhere else in the codebase
	@Deprecated
	public boolean mplayer() {
Solution content 
		return getDefaultArgs(); // unused; return this array for for backwards compatibility
	}

	// XXX hardwired to false and not referenced anywhere else in the codebase
	@Deprecated
	public boolean mplayer() {
File
FFMpegVideo.java
Developer's decision
Version 2
Kind of conflict
Method declaration