Skip to content

Release #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gcheng merged 2 commits into from
May 20, 2013
Merged

Release #344

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36489bd
fix two scenario tests for CI machine.
May 20, 2013
aa4c680
Merge pull request #40 from gcheng/cibugfix
May 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public Task.CreateBatchOperation createTaskOptions(String taskName, int inputAss
String configuration = null;
switch (encoderType) {
case WindowsAzureMediaEncoder:
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_WINDOWS_AZURE_MEDIA_ENCODER, "2.2.0.0");
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_WINDOWS_AZURE_MEDIA_ENCODER, "2.3");
// Full list of configurations strings for version 2.1 is at:
// http://msdn.microsoft.com/en-us/library/jj129582.aspx
configuration = "VC1 Broadband SD 4x3";
Expand Down