Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'

[ffmpeg] / libavcodec / avcodec.h

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index efe94eeb6cb28d2442564f9b88fe759ea5d234dd..7d10d3d0f0870ff95d2bd22c29fd2f49e080225d 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2613,7 +2613,6 @@ typedef struct AVCodecContext {
     /**
      * opaque 64bit number (generally a PTS) that will be reordered and
      * output in AVFrame.reordered_opaque
-     * @deprecated in favor of pkt_pts
      * - encoding: unused
      * - decoding: Set by user.
      */