-diff -urN a/libavcodec/avcodec.h b/libavcodec/avcodec.h
---- a/libavcodec/avcodec.h 2017-04-12 19:55:55.000000000 -0600
-+++ b/libavcodec/avcodec.h 2017-04-16 16:16:04.497012383 -0600
-@@ -4600,7 +4600,7 @@
- attribute_deprecated
- int av_packet_merge_side_data(AVPacket *pkt);
-
--attribute_deprecated
-+//attribute_deprecated
- int av_packet_split_side_data(AVPacket *pkt);
- #endif
-
-@@ -4838,7 +4838,7 @@
- *
- * @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
- */
--attribute_deprecated
-+//attribute_deprecated
- int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
- int *got_frame_ptr, const AVPacket *avpkt);
-
-@@ -4887,7 +4887,7 @@
- *
- * @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
- */
--attribute_deprecated
-+//attribute_deprecated
- int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
- int *got_picture_ptr,
- const AVPacket *avpkt);
-@@ -5363,7 +5363,7 @@
- *
- * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead
- */
--attribute_deprecated
-+//attribute_deprecated
- int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
- const AVFrame *frame, int *got_packet_ptr);
-
-@@ -5402,7 +5402,7 @@
- *
- * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead
- */
--attribute_deprecated
-+//attribute_deprecated
- int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
- const AVFrame *frame, int *got_packet_ptr);
-
-@@ -5924,7 +5924,7 @@
- * @return a bitstream filter context if a matching filter was found
- * and successfully initialized, NULL otherwise
- */
--attribute_deprecated
-+//attribute_deprecated
- AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
-
- /**
-@@ -5956,7 +5956,7 @@
- * its starting address). A special case is if *poutbuf was set to NULL and
- * *poutbuf_size was set to 0, which indicates the packet should be dropped.
- */
--attribute_deprecated
-+//attribute_deprecated
- int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
- AVCodecContext *avctx, const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
-@@ -5968,7 +5968,7 @@
- * @param bsf the bitstream filter context created with
- * av_bitstream_filter_init(), can be NULL
- */
--attribute_deprecated
-+//attribute_deprecated
- void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
-
- /**
-diff -urN a/libavformat/avformat.h b/libavformat/avformat.h
---- a/libavformat/avformat.h 2017-04-12 19:55:55.000000000 -0600
-+++ b/libavformat/avformat.h 2017-04-16 16:16:04.499012276 -0600
-@@ -889,7 +889,7 @@
- /**
- * @deprecated use the codecpar struct instead
- */
-- attribute_deprecated
-+// attribute_deprecated
- AVCodecContext *codec;
- #endif
- void *priv_data;