Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
9b348726
Commit
9b348726
authored
May 20, 2013
by
Yann Diorcet
Browse files
Provide old api if not provided by new libavcodec
parent
3f06cd60
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
src/Makefile.am
src/Makefile.am
+3
-1
src/utils/ffmpeg-priv.h
src/utils/ffmpeg-priv.h
+10
-1
No files found.
src/Makefile.am
View file @
9b348726
...
...
@@ -202,7 +202,9 @@ endif
if
BUILD_FFMPEG
libmediastreamer_voip_la_SOURCES
+=
videofilters/videoenc.c
\
videofilters/videodec.c
\
utils/swscale.h utils/ffmpeg-priv.h
\
utils/swscale.h
\
utils/ffmpeg-priv.h
\
utils/ffmpeg-priv.c
\
videofilters/h264dec.c
\
videofilters/jpegwriter.c
endif
...
...
src/utils/ffmpeg-priv.h
View file @
9b348726
...
...
@@ -69,5 +69,14 @@ static inline int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
return
avcodec_decode_video
(
avctx
,
picture
,
got_picture_ptr
,
avpkt
->
data
,
avpkt
->
size
);
}
#endif
#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52,25,0)
#define CodecID AVCodecID
#endif
#if !FF_API_ALLOC_CONTEXT
AVCodecContext
*
avcodec_alloc_context
(
void
);
void
avcodec_get_context_defaults
(
AVCodecContext
*
s
);
#endif
#if !FF_API_AVCODEC_OPEN
int
avcodec_open
(
AVCodecContext
*
avctx
,
AVCodec
*
codec
);
#endif
#endif
/* FFMPEG_PRIV_H */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment