Hendrik Leppkes
95f92b2513
Merge commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b'
...
* commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b':
lavc: Sanitize header inclusion guards
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-12 15:16:57 +02:00
Vittorio Giovara
f00f6d538d
lavc: Sanitize header inclusion guards
...
Fix typos, add missing comments, and remove stray lines.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-09-12 13:39:37 +02:00
Michael Niedermayer
5a20f1885d
Merge commit 'f20518568a77a6138fc74021ce56013ab72907ba'
...
* commit 'f20518568a77a6138fc74021ce56013ab72907ba':
build: Split WMA frequencies into a separate object file
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-04 19:46:06 +02:00
Diego Biurrun
f20518568a
build: Split WMA frequencies into a separate object file
...
These are the only WMA bits shared with binkaudio. Splitting them off
reduces the binnkaudio dependency on general WMA code.
2014-09-04 05:19:46 -07:00
