mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 17:20:36 +00:00
Drop dependency on libavformat.
This commit is contained in:
parent
781a7edd57
commit
fcb65d60f5
4 changed files with 16 additions and 11 deletions
1
NEWS
1
NEWS
|
@ -2,6 +2,7 @@ gst-vaapi NEWS -- summary of changes. 2010-06-DD
|
|||
Copyright (C) 2010 Splitted-Desktop Systems
|
||||
|
||||
Version 0.2.5 - DD.Jun.2010
|
||||
* Drop dependency on libavformat
|
||||
* Fix build with older VA-API 0.29-sds
|
||||
* Fix decoding of some H.264 streams. e.g. Ice Age 2 trailer
|
||||
|
||||
|
|
|
@ -272,12 +272,9 @@ else
|
|||
fi
|
||||
|
||||
dnl Check for FFmpeg
|
||||
PKG_CHECK_MODULES(LIBAVFORMAT, [libavformat])
|
||||
AC_CHECK_HEADERS([libavformat/avformat.h])
|
||||
|
||||
PKG_CHECK_MODULES(LIBAVCODEC, [libavcodec])
|
||||
AC_CHECK_HEADERS([libavcodec/avcodec.h])
|
||||
AC_CHECK_HEADERS([libavcodec/vaapi.h], [],
|
||||
AC_CHECK_HEADERS([libavcodec/avcodec.h ffmpeg/avcodec.h])
|
||||
AC_CHECK_HEADERS([libavcodec/vaapi.h ffmpeg/vaapi.h], [break],
|
||||
AC_MSG_ERROR([The system FFmpeg headers do not support VA-API]))
|
||||
|
||||
AC_DEFINE_UNQUOTED(USE_GLX, $USE_GLX,
|
||||
|
|
|
@ -140,7 +140,6 @@ libgstvaapi_@GST_MAJORMINOR@_la_CFLAGS = \
|
|||
$(GST_BASE_CFLAGS) \
|
||||
$(GST_CFLAGS) \
|
||||
$(LIBAVCODEC_CFLAGS) \
|
||||
$(LIBAVFORMAT_CFLAGS) \
|
||||
$(LIBVA_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
|
@ -148,7 +147,6 @@ libgstvaapi_@GST_MAJORMINOR@_la_LIBADD = \
|
|||
$(GST_BASE_LIBS) \
|
||||
$(GST_LIBS) \
|
||||
$(LIBAVCODEC_LIBS) \
|
||||
$(LIBAVFORMAT_LIBS) \
|
||||
$(LIBVA_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
@ -25,9 +25,18 @@
|
|||
*/
|
||||
|
||||
#include "config.h"
|
||||
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
|
||||
# include <libavcodec/avcodec.h>
|
||||
#endif
|
||||
#ifdef HAVE_FFMPEG_AVCODEC_H
|
||||
# include <ffmpeg/avcodec.h>
|
||||
#endif
|
||||
#ifdef HAVE_LIBAVCODEC_VAAPI_H
|
||||
# include <libavcodec/vaapi.h>
|
||||
#include <libavformat/avformat.h>
|
||||
#endif
|
||||
#ifdef HAVE_FFMPEG_VAAPI_H
|
||||
# include <ffmpeg/vaapi.h>
|
||||
#endif
|
||||
#include "gstvaapidecoder_ffmpeg.h"
|
||||
#include "gstvaapidecoder_priv.h"
|
||||
#include "gstvaapidisplay_priv.h"
|
||||
|
@ -598,7 +607,7 @@ gst_vaapi_decoder_ffmpeg_class_init(GstVaapiDecoderFfmpegClass *klass)
|
|||
static gpointer
|
||||
gst_vaapi_decoder_ffmpeg_init_once_cb(gpointer user_data)
|
||||
{
|
||||
av_register_all();
|
||||
avcodec_register_all();
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue