diff options
Diffstat (limited to 'toxav/toxav.h')
-rw-r--r-- | toxav/toxav.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/toxav/toxav.h b/toxav/toxav.h index a10b343f..6df9d300 100644 --- a/toxav/toxav.h +++ b/toxav/toxav.h | |||
@@ -288,7 +288,6 @@ int toxav_stop_call(ToxAv *av, int32_t call_index); | |||
288 | int toxav_prepare_transmission(ToxAv *av, int32_t call_index, ToxAvCodecSettings *codec_settings, int support_video); | 288 | int toxav_prepare_transmission(ToxAv *av, int32_t call_index, ToxAvCodecSettings *codec_settings, int support_video); |
289 | 289 | ||
290 | /** | 290 | /** |
291 | <<<<<<< HEAD | ||
292 | * @brief Call this at the end of the transmission. | 291 | * @brief Call this at the end of the transmission. |
293 | * | 292 | * |
294 | * @param av Handler. | 293 | * @param av Handler. |
@@ -299,8 +298,6 @@ int toxav_prepare_transmission(ToxAv *av, int32_t call_index, ToxAvCodecSettings | |||
299 | int toxav_kill_transmission(ToxAv *av, int32_t call_index); | 298 | int toxav_kill_transmission(ToxAv *av, int32_t call_index); |
300 | 299 | ||
301 | /** | 300 | /** |
302 | ======= | ||
303 | >>>>>>> upstream/master | ||
304 | * @brief Encode and send video packet. | 301 | * @brief Encode and send video packet. |
305 | * | 302 | * |
306 | * @param av Handler. | 303 | * @param av Handler. |