resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

doc improvements

This commit is contained in:
James Bardin 2016-06-07 16:57:34 -04:00
parent 8eb4858c26
commit 950950ff4b
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
website/source/docs/providers/aws/r/elastic_transcoder_pipeline.html.markdown
View File

@ -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

18
website/source/docs/providers/aws/r/elastic_transcoder_preset.html.markdown
View File

@ -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
The `audio` object supports the following: