[1/2] libavutil: Undeprecate the AVFrame reordered_opaque field

Message ID 20181025124521.30217-1-martin@martin.st
State Committed
Commit a3a501df240fa179fe12c2cf5dbbb4f1d9f650ca
Headers show
Series
  • [1/2] libavutil: Undeprecate the AVFrame reordered_opaque field
Related show

Commit Message

Martin Storsjö Oct. 25, 2018, 12:45 p.m.
This was marked as deprecated (but only in the doxygen, not with an
actual deprecation attribute) in 81c623fae05 in 2011, but was
undeprecated in ad1ee5fa7.
---
 libavutil/frame.h   | 1 -
 libavutil/version.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

Comments

Luca Barbato Oct. 26, 2018, 4:01 p.m. | #1
On 25/10/2018 14:45, Martin Storsjö wrote:
> This was marked as deprecated (but only in the doxygen, not with an
> actual deprecation attribute) in 81c623fae05 in 2011, but was
> undeprecated in ad1ee5fa7.
> ---
>  libavutil/frame.h   | 1 -
>  libavutil/version.h | 2 +-
>  2 files changed, 1 insertion(+), 2 deletions(-)
> 

The set is probably fine.

lu
Martin Storsjö Nov. 5, 2018, 2:04 p.m. | #2
On Fri, 26 Oct 2018, Luca Barbato wrote:

> On 25/10/2018 14:45, Martin Storsjö wrote:
>> This was marked as deprecated (but only in the doxygen, not with an
>> actual deprecation attribute) in 81c623fae05 in 2011, but was
>> undeprecated in ad1ee5fa7.
>> ---
>>  libavutil/frame.h   | 1 -
>>  libavutil/version.h | 2 +-
>>  2 files changed, 1 insertion(+), 2 deletions(-)
>> 
>
> The set is probably fine.

Pushed, with a minor adjustment to patch 2/2, to overestimate the buffer 
size needed, in case a reconfiguration increases the delay.

// Martin

Patch

diff --git a/libavutil/frame.h b/libavutil/frame.h
index ff3fe46dd6..c7240ebe9b 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -295,7 +295,6 @@  typedef struct AVFrame {
      * that time,
      * the decoder reorders values as needed and sets AVFrame.reordered_opaque
      * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
-     * @deprecated in favor of pkt_pts
      */
     int64_t reordered_opaque;
 
diff --git a/libavutil/version.h b/libavutil/version.h
index 4a9fffef43..e5fbd4ca81 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -55,7 +55,7 @@ 
 
 #define LIBAVUTIL_VERSION_MAJOR 56
 #define LIBAVUTIL_VERSION_MINOR  7
-#define LIBAVUTIL_VERSION_MICRO  0
+#define LIBAVUTIL_VERSION_MICRO  1
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \