diff options
| author |  Sourabh Bajaj <sourabhbajaj@google.com> | 2017-11-30 16:37:11 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-11-30 16:41:01 -0800 |
| commit | b2db981a6731e978453862a73dab892bc674db68 (patch) | |
| tree | c11a7c4038e2595268113c2859c1d0d3072ede4f /tensorflow/contrib/ffmpeg/__init__.py | |
| parent | 0438ac79bdb503ed267bec2146e7136ac8e99ff9 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 177526301
Diffstat (limited to 'tensorflow/contrib/ffmpeg/__init__.py')
| -rw-r--r-- | tensorflow/contrib/ffmpeg/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tensorflow/contrib/ffmpeg/__init__.py b/tensorflow/contrib/ffmpeg/__init__.py index 2bcb7284e1..484ffee3e7 100644 --- a/tensorflow/contrib/ffmpeg/__init__.py +++ b/tensorflow/contrib/ffmpeg/__init__.py @@ -26,9 +26,10 @@ from __future__ import division from __future__ import print_function from tensorflow.contrib.ffmpeg.ffmpeg_ops import decode_audio +from tensorflow.contrib.ffmpeg.ffmpeg_ops import decode_video from tensorflow.contrib.ffmpeg.ffmpeg_ops import encode_audio from tensorflow.python.util.all_util import remove_undocumented -_allowed_symbols = ['decode_audio', 'encode_audio'] +_allowed_symbols = ['decode_audio', 'encode_audio', 'decode_video'] remove_undocumented(__name__, _allowed_symbols) |