Merge commit '09c98327b9f25c6c1716c0ee82ce09d8b484887a'

[ffmpeg] / libavcodec / dnxhddata.h

diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h
index c96c5e8f65aa8f801d59e9588431e6e41994c6b2..f80ce18f3c43db0da51ff599fb6610128df41320 100644 (file)
--- a/libavcodec/dnxhddata.h
+++ b/libavcodec/dnxhddata.h
@@ -55,7 +55,6 @@ typedef struct CIDEntry {
     const uint16_t *run_codes;
     const uint8_t *run_bits, *run;
     int bit_rates[5]; ///< Helper to choose variants, rounded to nearest 5Mb/s
-    AVRational frame_rates[5];
     AVRational packet_scale;
 } CIDEntry;
 
@@ -106,8 +105,5 @@ static av_always_inline int ff_dnxhd_get_hr_frame_size(int cid, int w, int h)
 
 int avpriv_dnxhd_get_frame_size(int cid);
 int avpriv_dnxhd_get_interlaced(int cid);
-#if LIBAVCODEC_VERSION_MAJOR < 58
-attribute_deprecated
-uint64_t avpriv_dnxhd_parse_header_prefix(const uint8_t *buf);
-#endif
+
 #endif /* AVCODEC_DNXHDDATA_H */