| Message ID | 20200601113237.15114-1-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Commit | f02b1b12221843e4817e16f4fa210790a8c26184 |
| Headers | show |
| Series | [FFmpeg-devel,1/3] avcodec/encode: Remove ff_alloc_packet | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On 6/1/2020 8:32 AM, Andreas Rheinhardt wrote: > It is no longer used anymore. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > Strange that it has not already been removed earlier. Am I missing > something? Afaik, it was left in place to make merges from libav easier. LGTM. > > libavcodec/encode.c | 5 ----- > libavcodec/internal.h | 2 -- > 2 files changed, 7 deletions(-) > > diff --git a/libavcodec/encode.c b/libavcodec/encode.c > index b850f86d0c..b1784ed050 100644 > --- a/libavcodec/encode.c > +++ b/libavcodec/encode.c > @@ -70,11 +70,6 @@ int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size, int64 > } > } > > -int ff_alloc_packet(AVPacket *avpkt, int size) > -{ > - return ff_alloc_packet2(NULL, avpkt, size, 0); > -} > - > /** > * Pad last frame with silence. > */ > diff --git a/libavcodec/internal.h b/libavcodec/internal.h > index 0e3415d69b..d09c3167ed 100644 > --- a/libavcodec/internal.h > +++ b/libavcodec/internal.h > @@ -250,8 +250,6 @@ void ff_color_frame(AVFrame *frame, const int color[4]); > */ > int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size, int64_t min_size); > > -attribute_deprecated int ff_alloc_packet(AVPacket *avpkt, int size); > - > /** > * Rescale from sample rate to AVCodecContext.time_base. > */ >
diff --git a/libavcodec/encode.c b/libavcodec/encode.c index b850f86d0c..b1784ed050 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -70,11 +70,6 @@ int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size, int64 } } -int ff_alloc_packet(AVPacket *avpkt, int size) -{ - return ff_alloc_packet2(NULL, avpkt, size, 0); -} - /** * Pad last frame with silence. */ diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 0e3415d69b..d09c3167ed 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -250,8 +250,6 @@ void ff_color_frame(AVFrame *frame, const int color[4]); */ int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size, int64_t min_size); -attribute_deprecated int ff_alloc_packet(AVPacket *avpkt, int size); - /** * Rescale from sample rate to AVCodecContext.time_base. */
It is no longer used anymore. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- Strange that it has not already been removed earlier. Am I missing something? libavcodec/encode.c | 5 ----- libavcodec/internal.h | 2 -- 2 files changed, 7 deletions(-)