Luke Pulverenti 949d23f06a fix merge conflict

2015-12-19 12:45:50 -05:00

..

AudioEncoder.cs

…

BaseEncoder.cs

update qsv encoding

2015-11-26 23:34:11 -05:00

EncodingJob.cs

add codec tag value

2015-10-19 12:05:03 -04:00

EncodingJobFactory.cs

update sorting menus

2015-12-10 23:48:28 -05:00

EncodingUtils.cs

…

JobLogger.cs

…

MediaEncoder.cs

fix merge conflict

2015-12-19 12:45:50 -05:00

VideoEncoder.cs

…