diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2017-04-13 15:23:45 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2017-04-13 15:23:45 +0300 |
| commit | 32addd9757b44b7cc64c87ba2392282dbe30270e (patch) | |
| tree | 23d1aebea3c6a57ebb089d8b6c5f2fcdfddcc580 | |
| parent | 58544546ff5a56c243e5e84c993ac46b824e03e2 (diff) | |
| download | gst-libav-32addd9757b44b7cc64c87ba2392282dbe30270e.tar.gz | |
avaudenc/dec: Blacklist more PCM decoders/encoders
| -rw-r--r-- | ext/libav/gstavauddec.c | 4 | ||||
| -rw-r--r-- | ext/libav/gstavaudenc.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ext/libav/gstavauddec.c b/ext/libav/gstavauddec.c index 4d04dfa..9aa45e3 100644 --- a/ext/libav/gstavauddec.c +++ b/ext/libav/gstavauddec.c @@ -881,7 +881,9 @@ gst_ffmpegauddec_register (GstPlugin * plugin) (in_plugin->id >= AV_CODEC_ID_PCM_S16LE && in_plugin->id <= AV_CODEC_ID_PCM_BLURAY) || (in_plugin->id >= AV_CODEC_ID_PCM_S8_PLANAR && -#if AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= AV_VERSION_INT (57,54,0) +#if AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= AV_VERSION_INT (57,69,0) + in_plugin->id <= AV_CODEC_ID_PCM_F24LE)) { +#elif AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= AV_VERSION_INT (57,54,0) in_plugin->id <= AV_CODEC_ID_PCM_S64BE)) { #else in_plugin->id <= AV_CODEC_ID_PCM_S16BE_PLANAR)) { diff --git a/ext/libav/gstavaudenc.c b/ext/libav/gstavaudenc.c index 12cc804..6ffbc3e 100644 --- a/ext/libav/gstavaudenc.c +++ b/ext/libav/gstavaudenc.c @@ -791,7 +791,9 @@ gst_ffmpegaudenc_register (GstPlugin * plugin) (in_plugin->id >= AV_CODEC_ID_PCM_S16LE && in_plugin->id <= AV_CODEC_ID_PCM_BLURAY) || (in_plugin->id >= AV_CODEC_ID_PCM_S8_PLANAR && -#if AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= AV_VERSION_INT (57,54,0) +#if AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= AV_VERSION_INT (57,69,0) + in_plugin->id <= AV_CODEC_ID_PCM_F24LE)) { +#elif AV_VERSION_INT (LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) >= AV_VERSION_INT (57,54,0) in_plugin->id <= AV_CODEC_ID_PCM_S64BE)) { #else in_plugin->id <= AV_CODEC_ID_PCM_S16BE_PLANAR)) { |