diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2016-07-22 14:54:21 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-07-25 13:22:16 +0300 |
| commit | 70c281b545a383d45ec2fca296ce2387e1eac59e (patch) | |
| tree | aa4f370446ea36709524254af0374dc1770a36f0 | |
| parent | 8666d9fda0be7f86f548297dc83b09d92824de49 (diff) | |
| download | gst-libav-70c281b545a383d45ec2fca296ce2387e1eac59e.tar.gz | |
libav: Ignore more quasi-codecs
| -rw-r--r-- | ext/libav/gstavauddec.c | 9 | ||||
| -rw-r--r-- | ext/libav/gstavaudenc.c | 7 | ||||
| -rw-r--r-- | ext/libav/gstavviddec.c | 15 | ||||
| -rw-r--r-- | ext/libav/gstavvidenc.c | 10 |
4 files changed, 31 insertions, 10 deletions
diff --git a/ext/libav/gstavauddec.c b/ext/libav/gstavauddec.c index e55c256..3fd568f 100644 --- a/ext/libav/gstavauddec.c +++ b/ext/libav/gstavauddec.c @@ -873,9 +873,12 @@ gst_ffmpegauddec_register (GstPlugin * plugin) goto next; } - /* no quasi-codecs, please */ - if (in_plugin->id >= AV_CODEC_ID_PCM_S16LE && - in_plugin->id <= AV_CODEC_ID_PCM_BLURAY) { + /* no quasi codecs, please */ + if (in_plugin->id == AV_CODEC_ID_PCM_S16LE_PLANAR || + (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 && + in_plugin->id <= AV_CODEC_ID_PCM_S16BE_PLANAR)) { goto next; } diff --git a/ext/libav/gstavaudenc.c b/ext/libav/gstavaudenc.c index 0500a33..3f39ce1 100644 --- a/ext/libav/gstavaudenc.c +++ b/ext/libav/gstavaudenc.c @@ -784,8 +784,11 @@ gst_ffmpegaudenc_register (GstPlugin * plugin) goto next; /* no quasi codecs, please */ - if ((in_plugin->id >= AV_CODEC_ID_PCM_S16LE && - in_plugin->id <= AV_CODEC_ID_PCM_BLURAY)) { + if (in_plugin->id == AV_CODEC_ID_PCM_S16LE_PLANAR || + (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 && + in_plugin->id <= AV_CODEC_ID_PCM_S16BE_PLANAR)) { goto next; } diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c index 2fdff95..d341174 100644 --- a/ext/libav/gstavviddec.c +++ b/ext/libav/gstavviddec.c @@ -2025,13 +2025,20 @@ gst_ffmpegviddec_register (GstPlugin * plugin) || in_plugin->type != AVMEDIA_TYPE_VIDEO) goto next; - /* no quasi-codecs, please */ + /* no quasi codecs, please */ if (in_plugin->id == AV_CODEC_ID_RAWVIDEO || in_plugin->id == AV_CODEC_ID_V210 || in_plugin->id == AV_CODEC_ID_V210X || - in_plugin->id == AV_CODEC_ID_R210 || - (in_plugin->id >= AV_CODEC_ID_PCM_S16LE && - in_plugin->id <= AV_CODEC_ID_PCM_BLURAY)) { + in_plugin->id == AV_CODEC_ID_V308 || + in_plugin->id == AV_CODEC_ID_V408 || + in_plugin->id == AV_CODEC_ID_V410 || + in_plugin->id == AV_CODEC_ID_R210 + || in_plugin->id == AV_CODEC_ID_AYUV + || 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) { goto next; } diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c index f22f697..9fb7f64 100644 --- a/ext/libav/gstavvidenc.c +++ b/ext/libav/gstavvidenc.c @@ -958,8 +958,16 @@ gst_ffmpegvidenc_register (GstPlugin * plugin) if (in_plugin->id == AV_CODEC_ID_RAWVIDEO || in_plugin->id == AV_CODEC_ID_V210 || in_plugin->id == AV_CODEC_ID_V210X || + in_plugin->id == AV_CODEC_ID_V308 || + in_plugin->id == AV_CODEC_ID_V408 || + in_plugin->id == AV_CODEC_ID_V410 || in_plugin->id == AV_CODEC_ID_R210 - || in_plugin->id == AV_CODEC_ID_ZLIB) { + || in_plugin->id == AV_CODEC_ID_AYUV + || 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) { goto next; } |