diff options
| author | irungentoo <irungentoo@gmail.com> | 2013-10-28 16:01:29 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2013-10-28 16:01:29 -0400 |
| commit | 415835ce3d2daa9ecd4100e76d58d93b3afa2db0 (patch) | |
| tree | 755d041ea06a9b1c05fc72687c9dd5c6e98bbe73 /toxmsi/phone.c | |
| parent | 988922bdeb94dd83e61ed387b29187ac4c9936e0 (diff) | |
| parent | 2bdce934373d238778bc77a04198bd3f1481542f (diff) | |
Merge branch 'master' into harden
Also removed some old, useless loading code.
Diffstat (limited to 'toxmsi/phone.c')
| -rw-r--r-- | toxmsi/phone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toxmsi/phone.c b/toxmsi/phone.c index f14d0323..432be94c 100644 --- a/toxmsi/phone.c +++ b/toxmsi/phone.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <stdlib.h> | 16 | #include <stdlib.h> |
| 17 | /* #include <termios.h> Can this be removed? */ | 17 | /* #include <termios.h> Can this be removed? */ |
| 18 | #include <pthread.h> | 18 | #include <pthread.h> |
| 19 | #include "AV_codec.h" | 19 | #include "toxmedia.h" |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | 22 | ||