diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 23:04:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 23:04:47 +0200 |
| commit | c7c33ab721cfafbbe269c8f1505eb2d9a80d7af4 (patch) | |
| tree | 27f85a58ac742deb2c037e05ccbb7ee56b7540ff /libavcodec/libopusenc.c | |
| parent | 65b0f7ce08170dd2ca2998d42e0bd9f1cb82e76c (diff) | |
| parent | f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09 (diff) | |
| download | ffmpeg-c7c33ab721cfafbbe269c8f1505eb2d9a80d7af4.tar.gz | |
Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09'
* commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09':
configure: Factor out g722dsp module
Conflicts:
configure
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/libopusenc.c')
0 files changed, 0 insertions, 0 deletions