mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 05:56:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

avaudenc/dec: Allow compilation against ffmpeg < 3.2 again

Browse source
This commit is contained in:
Sebastian Dröge 2016-10-26 23:29:18 +03:00
parent 440482475f
commit f1bca3115e
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/libav/gstavauddec.c
View file

@ -878,7 +878,11 @@ gst_ffmpegauddec_register (GstPlugin * plugin)
(in_plugin->id >= AV_CODEC_ID_PCM_S16LE && (in_plugin->id >= AV_CODEC_ID_PCM_S16LE &&
in_plugin->id <= AV_CODEC_ID_PCM_BLURAY) || in_plugin->id <= AV_CODEC_ID_PCM_BLURAY) ||
(in_plugin->id >= AV_CODEC_ID_PCM_S8_PLANAR && (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)
in_plugin->id <= AV_CODEC_ID_PCM_S64BE)) { in_plugin->id <= AV_CODEC_ID_PCM_S64BE)) {
#else
in_plugin->id <= AV_CODEC_ID_PCM_S16BE_PLANAR)) {
#endif
goto next; goto next;
} }

4
ext/libav/gstavaudenc.c
View file

@ -788,7 +788,11 @@ gst_ffmpegaudenc_register (GstPlugin * plugin)
(in_plugin->id >= AV_CODEC_ID_PCM_S16LE && (in_plugin->id >= AV_CODEC_ID_PCM_S16LE &&
in_plugin->id <= AV_CODEC_ID_PCM_BLURAY) || in_plugin->id <= AV_CODEC_ID_PCM_BLURAY) ||
(in_plugin->id >= AV_CODEC_ID_PCM_S8_PLANAR && (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)
in_plugin->id <= AV_CODEC_ID_PCM_S64BE)) { in_plugin->id <= AV_CODEC_ID_PCM_S64BE)) {
#else
in_plugin->id <= AV_CODEC_ID_PCM_S16BE_PLANAR)) {
#endif
goto next; goto next;
} }