diff options
author | Clément Bœsch <cboesch@gopro.com> | 2017-02-02 11:35:07 +0100 |
---|---|---|
committer | Clément Bœsch <cboesch@gopro.com> | 2017-02-02 11:36:34 +0100 |
commit | f47540523741fdc98f2467e522dc6dac0ade4a0b (patch) | |
tree | 3956377e5c4bc6fed3a3a1e9471af51cff5a9adf /libavcodec/mpcdata.h | |
parent | 5e013586bf9a031275b78aaaba0d97f2319d58a5 (diff) | |
parent | 7f549b8338ed3775fec4bf10421ff5744e5866dd (diff) | |
download | ffmpeg-f47540523741fdc98f2467e522dc6dac0ade4a0b.tar.gz |
Merge commit '7f549b8338ed3775fec4bf10421ff5744e5866dd'
* commit '7f549b8338ed3775fec4bf10421ff5744e5866dd':
riff: don't overwrite bps from WAVEFORMATEX if EXTENSIBLE doesn't contain that data.
Only cosmetics, the change was already present.
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavcodec/mpcdata.h')
0 files changed, 0 insertions, 0 deletions