diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-31 17:18:37 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-31 17:18:37 -0300 |
| commit | 99fa2fc5db06f842fdf91008fcc1e352cbe9e9dc (patch) | |
| tree | a7980a8023a2e4f1e9d5d1994642be1496f68601 /libavcodec/resample.c | |
| parent | 4fe9d6964830f0eec94165da02c95cc2669fdfe1 (diff) | |
| parent | fea4dc05b41f5465bedc786b67966f204ec6150c (diff) | |
| download | ffmpeg-99fa2fc5db06f842fdf91008fcc1e352cbe9e9dc.tar.gz | |
Merge commit 'fea4dc05b41f5465bedc786b67966f204ec6150c'
* commit 'fea4dc05b41f5465bedc786b67966f204ec6150c':
vc1: Return stream format information from parser
This commit is a noop, see 4df6605da7e351116c99f19b8a98e1f236932600
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/resample.c')
0 files changed, 0 insertions, 0 deletions