Skip to content
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

Add support for Amazon Elastic Transcoder #6965

Merged
merged 6 commits into from
Jun 7, 2016
Merged

Add support for Amazon Elastic Transcoder #6965

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c1b625
Add support for Amazon Elastic Transcoder
jbardin May 26, 2016
3ec1c61
vendor aws/aws-sdk-go/service/elastictranscoder
jbardin Jun 6, 2016
8eb4858
Add Elastic Transcoder docs
jbardin Jun 7, 2016
950950f
doc improvements
jbardin Jun 7, 2016
5b56412
remove extra "=" from test config
jbardin Jun 7, 2016
45c88bf
s/ForceNew/Forces new resource/
jbardin Jun 7, 2016
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
12 changes: 6 additions & 6 deletions website/source/docs/providers/aws/r/elastic_transcoder_pipeline.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ The following arguments are supported:
* `content_config` - (Optional) The ContentConfig object specifies information about the Amazon S3 bucket in which you want Elastic Transcoder to save transcoded files and playlists. (documented below)
* `content_config_permissions` - (Optional) The permissions for the `content_config` object. (documented below)
* `input_bucket` - (Required) The Amazon S3 bucket in which you saved the media files that you want to transcode and the graphics that you want to use as watermarks.
* `name` - (Optional) The name of the pipeline. Maximum 40 characters
* `notifications` - The Amazon Simple Notification Service (Amazon SNS) topic that you want to notify to report job status. (documented below)
* `output_bucket` - The Amazon S3 bucket in which you want Elastic Transcoder to save the transcoded files.
* `role` - The IAM Amazon Resource Name (ARN) for the role that you want Elastic Transcoder to use to transcode jobs for this pipeline.
* `thumbnail_config` - The ThumbnailConfig object specifies information about the Amazon S3 bucket in which you want Elastic Transcoder to save thumbnail files. (documented below)
* `thumbnail_config_permissions` - The permissions for the `thumbnail_config` object. (documented below)
* `name` - (Optional, ForceNew) The name of the pipeline. Maximum 40 characters
* `notifications` - (Optional) The Amazon Simple Notification Service (Amazon SNS) topic that you want to notify to report job status. (documented below)
* `output_bucket` - (Optional) The Amazon S3 bucket in which you want Elastic Transcoder to save the transcoded files.
* `role` - (Required) The IAM Amazon Resource Name (ARN) for the role that you want Elastic Transcoder to use to transcode jobs for this pipeline.
* `thumbnail_config` - (Optional) The ThumbnailConfig object specifies information about the Amazon S3 bucket in which you want Elastic Transcoder to save thumbnail files. (documented below)
* `thumbnail_config_permissions` - (Optional) The permissions for the `thumbnail_config` object. (documented below)

The `content_config` object specifies information about the Amazon S3 bucket in
which you want Elastic Transcoder to save transcoded files and playlists: which
Expand Down
18 changes: 9 additions & 9 deletions website/source/docs/providers/aws/r/elastic_transcoder_preset.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ See ["Create Preset"](http://docs.aws.amazon.com/elastictranscoder/latest/develo

The following arguments are supported:

* `audio` - Audio parameters object (documented below).
* `audio_codec_options` - Codec options for the audio parameters (documented below)
* `container` - (Required) The container type for the output file. Valid values are `flac`, `flv`, `fmp4`, `gif`, `mp3`, `mp4`, `mpg`, `mxf`, `oga`, `ogg`, `ts`, and `webm`.
* `description` - (Optional) A description of the preset (maximum 255 characters)
* `name` - (Optional) The name of the preset. (maximum 40 characters)
* `thumbnails` - (Optional) Thumbnail parameters object (documented below)
* `video` - (Optional) Video parameters object (documented below)
* `video_watermarks` - (Optional) Watermark parameters for the video parameters (documented below)
* `video_codec_options` (Optional) Codec options for the video parameters
* `audio` - (Optional, ForceNew) Audio parameters object (documented below).
* `audio_codec_options` - (Optional, ForceNew) Codec options for the audio parameters (documented below)
* `container` - (Required, ForceNew) The container type for the output file. Valid values are `flac`, `flv`, `fmp4`, `gif`, `mp3`, `mp4`, `mpg`, `mxf`, `oga`, `ogg`, `ts`, and `webm`.
* `description` - (Optional, ForceNew) A description of the preset (maximum 255 characters)
* `name` - (Optional, ForceNew) The name of the preset. (maximum 40 characters)
* `thumbnails` - (Optional, ForceNew) Thumbnail parameters object (documented below)
* `video` - (Optional, ForceNew) Video parameters object (documented below)
* `video_watermarks` - (Optional, ForceNew) Watermark parameters for the video parameters (documented below)
* `video_codec_options` (Optional, ForceNew) Codec options for the video parameters
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the docs our convention here is , Forces new resource


The `audio` object supports the following:

Expand Down