diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 12:47:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 13:01:26 +0200 |
| commit | 93704e09c77e991e18c8bc1f0ab7f1e03062150e (patch) | |
| tree | 79708be5bda73fe13855cbab2d7be6c5c84aa03b /libavcodec/sipr16k.c | |
| parent | 97a407f696ae212d53b77ab7e37e0be749e3167e (diff) | |
| parent | 72025ac36c740f031d7e413041fdfe97087c83c4 (diff) | |
| download | ffmpeg-93704e09c77e991e18c8bc1f0ab7f1e03062150e.tar.gz | |
Merge commit '72025ac36c740f031d7e413041fdfe97087c83c4'
* commit '72025ac36c740f031d7e413041fdfe97087c83c4':
lavc: add libdcadec decoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libdcadec.c
See: 519868de7d9c99876efcaf57d6a9683c22732cde
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr16k.c')
0 files changed, 0 insertions, 0 deletions