ffmpeg | branch: master | Carl Eugen Hoyos <ceffm...@gmail.com> | Thu Oct 26 18:29:02 2017 +0200| [f2c867051c8fb2eb06c1b43a4b08d60a1eafd987] | committer: Carl Eugen Hoyos
lavc/avcodec: Constify the return value of av_bitstream_filter_next(). Fixes the following gcc warning: libavcodec/bitstream_filter.c:39:12: warning: return discards 'const' qualifier from pointer target type > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2c867051c8fb2eb06c1b43a4b08d60a1eafd987 --- libavcodec/avcodec.h | 2 +- libavcodec/bitstream_filter.c | 2 +- libavcodec/version.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5f13f865e4..ee7834c8a2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -5484,7 +5484,7 @@ void av_bitstream_filter_close(AVBitStreamFilterContext *bsf); * filters. */ attribute_deprecated -AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f); +const AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f); #endif /** diff --git a/libavcodec/bitstream_filter.c b/libavcodec/bitstream_filter.c index d2bf86d894..ed1cf3335b 100644 --- a/libavcodec/bitstream_filter.c +++ b/libavcodec/bitstream_filter.c @@ -28,7 +28,7 @@ #if FF_API_OLD_BSF FF_DISABLE_DEPRECATION_WARNINGS -AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f) +const AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f) { const AVBitStreamFilter *filter = NULL; void *opaque = NULL; diff --git a/libavcodec/version.h b/libavcodec/version.h index 69f124a4c6..226da1935f 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 0 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
