diff options
author | James Almer <jamrial@gmail.com> | 2016-06-26 15:14:17 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2016-06-26 15:14:17 -0300 |
commit | 104c357b6a3ee181e1d657df68e38c17ba2bda77 (patch) | |
tree | 8de7acbcf90609e153169a3d0c65eba46b93b15c /tests/ref | |
parent | b2a74dd629c1ab3318ba0123f8814797a4fea3a4 (diff) | |
parent | e9394ca63dab3434bc8e869de019ecd86cb604ac (diff) | |
download | ffmpeg-104c357b6a3ee181e1d657df68e38c17ba2bda77.tar.gz |
Merge branch 'master' into release/3.1
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests/ref')
-rw-r--r-- | tests/ref/fate/dxtory | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/ref/fate/dxtory b/tests/ref/fate/dxtory index bda8872816..4ebcaf6f82 100644 --- a/tests/ref/fate/dxtory +++ b/tests/ref/fate/dxtory @@ -3,9 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 1280x720 #sar 0: 0/1 -#tb 1: 1/48000 -#media_type 1: audio -#codec_id 1: pcm_s16le -#sample_rate 1: 48000 -#channel_layout 1: 3 0, 0, 0, 1, 1382400, 0x44373645 |