]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e950c9 a972fc1)
Merge commit 'a972fc1c0ab6e7f169f9145d6da46e8cedbc291c'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:42:31 +0000 (15:42 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:42:55 +0000 (15:42 +0100)
* commit 'a972fc1c0ab6e7f169f9145d6da46e8cedbc291c':
  wma: Kill non-compiling disabled cruft

See 0755033f8af774cea34566adec455fbafd9f66bc

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavcodec/wma.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/wma.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.