diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:46:01 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:46:01 +0100 |
commit | d97a61a8f132e749f5b808300e126f9c0c3acfa1 (patch) | |
tree | ca7729c4772a1e2b7f16b3e8e5afb01269ff7bac /libswresample | |
parent | 1106a2c5dd7e45dc0c559250a4d060ab496e3f8a (diff) | |
parent | a84713e70d06238100cb0f867ad6031c272054b0 (diff) | |
download | ffmpeg-d97a61a8f132e749f5b808300e126f9c0c3acfa1.tar.gz |
Merge commit 'a84713e70d06238100cb0f867ad6031c272054b0'
This commit is a no-op.
* commit 'a84713e70d06238100cb0f867ad6031c272054b0':
parseutils-test: Move some variable declarations to avoid block braces
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions