OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5e01358
7f549b8
)
Merge commit '7f549b8338ed3775fec4bf10421ff5744e5866dd'
author
Clément Bœsch
<cboesch@gopro.com>
Thu, 2 Feb 2017 10:35:07 +0000
(11:35 +0100)
committer
Clément Bœsch
<cboesch@gopro.com>
Thu, 2 Feb 2017 10:36:34 +0000
(11:36 +0100)
* 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>
1
2
libavformat/riffdec.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libavformat/riffdec.c
Simple merge