diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-26 23:19:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-26 23:19:56 +0200 |
| commit | 27e61a716c893a6ae67ca8f859c735bc0b0b799a (patch) | |
| tree | 5061f79f4095f0b24d8b261a209cfe6214cea95a /libavcodec/g722enc.c | |
| parent | 867686997cbacd06cf5056c2741494bda23a7819 (diff) | |
| parent | 5fd553d31272d5ed42a7a5a0ecaab7b3452da83a (diff) | |
| download | ffmpeg-27e61a716c893a6ae67ca8f859c735bc0b0b799a.tar.gz | |
Merge commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a'
* commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a':
configure: Only redefine inline to __inline for msvc if necessary
Conflicts:
configure
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/g722enc.c')
0 files changed, 0 insertions, 0 deletions