diff options
| author | Iain Lane <iain@orangesquash.org.uk> | 2016-09-02 16:55:46 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-09-03 14:21:32 +0300 |
| commit | 2d42d99c68d8d50c6a1406cdc7c1dc608bf00b5b (patch) | |
| tree | 74f80b85cf300f61850681e9a9fd12b3ffdff7e9 | |
| parent | 8612bf25fbc57b4fb867bf5d2b824250f5e015f1 (diff) | |
| download | gst-libav-2d42d99c68d8d50c6a1406cdc7c1dc608bf00b5b.tar.gz | |
Only use AV_CODEC_ID_WRAPPED_AVFRAME on new enough libavcodecs
https://bugzilla.gnome.org/show_bug.cgi?id=770753
| -rw-r--r-- | ext/libav/gstavviddec.c | 7 | ||||
| -rw-r--r-- | ext/libav/gstavvidenc.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c index 8aabcb1..71310ec 100644 --- a/ext/libav/gstavviddec.c +++ b/ext/libav/gstavviddec.c @@ -2044,8 +2044,11 @@ gst_ffmpegviddec_register (GstPlugin * plugin) || in_plugin->id == AV_CODEC_ID_Y41P || in_plugin->id == AV_CODEC_ID_012V || in_plugin->id == AV_CODEC_ID_YUV4 - || in_plugin->id == AV_CODEC_ID_ZLIB - || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME) { +#if AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= \ + AV_VERSION_INT (57,4,0) + || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME +#endif + || in_plugin->id == AV_CODEC_ID_ZLIB) { goto next; } diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c index 9fb7f64..2ec32d8 100644 --- a/ext/libav/gstavvidenc.c +++ b/ext/libav/gstavvidenc.c @@ -966,8 +966,11 @@ gst_ffmpegvidenc_register (GstPlugin * plugin) || in_plugin->id == AV_CODEC_ID_Y41P || in_plugin->id == AV_CODEC_ID_012V || in_plugin->id == AV_CODEC_ID_YUV4 - || in_plugin->id == AV_CODEC_ID_ZLIB - || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME) { +#if AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= \ + AV_VERSION_INT (57,4,0) + || in_plugin->id == AV_CODEC_ID_WRAPPED_AVFRAME +#endif + || in_plugin->id == AV_CODEC_ID_ZLIB) { goto next; } |