Commit 2f39b407 authored by Gautier Pelloux-Prayer's avatar Gautier Pelloux-Prayer
Browse files

ffmpeg api deprecated warnings removal

parent 2204eb63
...@@ -24,6 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -24,6 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "mediastreamer2/msticker.h" #include "mediastreamer2/msticker.h"
#include "stream_regulator.h" #include "stream_regulator.h"
#if __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
#include "ffmpeg-priv.h" #include "ffmpeg-priv.h"
#include "ortp/b64.h" #include "ortp/b64.h"
...@@ -454,3 +459,7 @@ void __register_ffmpeg_h264_decoder_if_possible(MSFactory *obj) { ...@@ -454,3 +459,7 @@ void __register_ffmpeg_h264_decoder_if_possible(MSFactory *obj) {
ms_factory_register_filter(obj, &ms_h264_dec_desc); ms_factory_register_filter(obj, &ms_h264_dec_desc);
} }
} }
#if __clang__
#pragma clang diagnostic pop
#endif
...@@ -29,6 +29,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -29,6 +29,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "mediastreamer2/mswebcam.h" #include "mediastreamer2/mswebcam.h"
#if __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
#ifndef NO_FFMPEG #ifndef NO_FFMPEG
#include "ffmpeg-priv.h" #include "ffmpeg-priv.h"
#else #else
...@@ -538,3 +543,7 @@ void ms_static_image_set_default_image(const char *path){ ...@@ -538,3 +543,7 @@ void ms_static_image_set_default_image(const char *path){
const char *ms_static_image_get_default_image(){ const char *ms_static_image_get_default_image(){
return def_image; return def_image;
} }
#if __clang__
#pragma clang diagnostic pop
#endif
...@@ -21,6 +21,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -21,6 +21,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "mediastreamer-config.h" #include "mediastreamer-config.h"
#endif #endif
#if __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
#include "ffmpeg-priv.h" #include "ffmpeg-priv.h"
#include "mediastreamer2/msfilter.h" #include "mediastreamer2/msfilter.h"
...@@ -968,3 +973,7 @@ MS_FILTER_DESC_EXPORT(ms_snow_dec_desc) ...@@ -968,3 +973,7 @@ MS_FILTER_DESC_EXPORT(ms_snow_dec_desc)
MS_FILTER_DESC_EXPORT(ms_jpeg_dec_desc) MS_FILTER_DESC_EXPORT(ms_jpeg_dec_desc)
/* decode JPEG image with jpeg headers */ /* decode JPEG image with jpeg headers */
MS_FILTER_DESC_EXPORT(ms_mjpeg_dec_desc) MS_FILTER_DESC_EXPORT(ms_mjpeg_dec_desc)
#if __clang__
#pragma clang diagnostic pop
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment