Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix FTBFS on Ubuntu 16.04 LTS #481

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix FTBFS on Ubuntu 16.04 LTS #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e5d850
Fix FTBFS on Ubuntu 16.04 LTS
madscientist159 Aug 17, 2016
a82428d
Fix telepresence FTBFS due to missing libavconv functions on Ubuntu 1…
madscientist159 Aug 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tinyDAV/src/codecs/h263/tdav_codec_h263.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ tdav_codec_h263_t;

#define TDAV_DECLARE_CODEC_H263 tdav_codec_h263_t __codec_h263__

static int tdav_codec_h263_init(tdav_codec_h263_t* self, tdav_codec_h263_type_t type, enum CodecID encoder, enum CodecID decoder);
static int tdav_codec_h263_init(tdav_codec_h263_t* self, tdav_codec_h263_type_t type, enum AVCodecID encoder, enum AVCodecID decoder);
static int tdav_codec_h263_deinit(tdav_codec_h263_t* self);
static int tdav_codec_h263_open_encoder(tdav_codec_h263_t* self);
static int tdav_codec_h263_open_decoder(tdav_codec_h263_t* self);
Expand Down Expand Up @@ -178,7 +178,7 @@ static int tdav_codec_h263_set(tmedia_codec_t* self, const tmedia_param_t* param
return -1;
}

int tdav_codec_h263_init(tdav_codec_h263_t* self, tdav_codec_h263_type_t type, enum CodecID encoder, enum CodecID decoder)
int tdav_codec_h263_init(tdav_codec_h263_t* self, tdav_codec_h263_type_t type, enum AVCodecID encoder, enum AVCodecID decoder)
{
int ret = 0;

Expand Down
11 changes: 11 additions & 0 deletions tinyDAV/src/tdav.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,17 @@ static struct tsk_plugin_s* __dll_plugin_ipsec_wfp = tsk_null; /* IPSec implemen

#if HAVE_FFMPEG
# include <libavcodec/avcodec.h>
# if LIBAVCODEC_VERSION_MAJOR >= 54
AVCodecContext *avcodec_alloc_context(void) {
return avcodec_alloc_context3(NULL);
}
void avcodec_get_context_defaults(AVCodecContext *s) {
avcodec_get_context_defaults3(s, NULL);
}
int avcodec_open(AVCodecContext *avctx, AVCodec *codec) {
return avcodec_open2(avctx, codec, NULL);
}
# endif
#endif

static inline int _tdav_codec_plugins_collect();
Expand Down