diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 15:45:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 16:05:33 +0200 |
| commit | 7093e215d02ed0dc9632f82ac8ccec432d29cd35 (patch) | |
| tree | b41d3772ec361212b717c827155b4544b1ef04cb /libavcodec/qsvdec.h | |
| parent | 2dbaec690d9f8e25e12b80e1162097e96b30ddc8 (diff) | |
| parent | 6b15874fc2c3f565732201f7907ae1112727d6ae (diff) | |
Merge commit '6b15874fc2c3f565732201f7907ae1112727d6ae'
* commit '6b15874fc2c3f565732201f7907ae1112727d6ae':
af_resample: do not touch the timestamps if we are not resampling
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/qsvdec.h')
0 files changed, 0 insertions, 0 deletions