[FFmpeg-devel] [PATCH] Make a potential major version bump build without errors

[Eli Friedman]

Per subject: a major version bump won't build without changes similar
to the attached.

-Eli
-------------- next part --------------
Index: libavcodec/avcodec.h
===================================================================
--- libavcodec/avcodec.h	(revision 18251)
+++ libavcodec/avcodec.h	(working copy)
@@ -2266,7 +2268,6 @@
      */
     int64_t timecode_frame_start;
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
     /**
      * Decoder should decode to this many channels if it can (0 for default)
      * - encoding: unused
@@ -2274,7 +2275,6 @@
      * @deprecated Deprecated in favor of request_channel_layout.
      */
     int request_channels;
-#endif
 
     /**
      * Percentage of dynamic range compression to be applied by the decoder.
@@ -2498,7 +2498,6 @@
     int linesize[4];       ///< number of bytes per line
 } AVPicture;
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
  * AVPaletteControl
  * This structure defines a method for communicating palette changes
@@ -2522,7 +2521,6 @@
     unsigned int palette[AVPALETTE_COUNT];
 
 } AVPaletteControl attribute_deprecated;
-#endif
 
 enum AVSubtitleType {
     SUBTITLE_NONE,
Index: libavcodec/bitstream.c
===================================================================
--- libavcodec/bitstream.c	(revision 18251)
+++ libavcodec/bitstream.c	(working copy)
@@ -37,7 +37,6 @@
  8, 9,10,11,12,13,14,15
 };
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
  * Same as av_mallocz_static(), but does a realloc.
  *
@@ -54,7 +53,6 @@
 {
     return av_realloc(ptr, size);
 }
-#endif
 
 void align_put_bits(PutBitContext *s)
 {