Browse Source

avcodec: remove no longer needed ff_codec_close_recursive()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 11 years ago
parent
commit
0739614c9c
3 changed files with 1 additions and 15 deletions
  1. +0
    -5
      libavcodec/internal.h
  2. +1
    -1
      libavcodec/smvjpegdec.c
  3. +0
    -9
      libavcodec/utils.c

+ 0
- 5
libavcodec/internal.h View File

@@ -225,11 +225,6 @@ int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx);
*/
int ff_codec_open2_recursive(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);

/**
* Call avcodec_close recursively, counterpart to avcodec_open2_recursive.
*/
int ff_codec_close_recursive(AVCodecContext *avctx);

/**
* Finalize buf into extradata and set its size appropriately.
*/


+ 1
- 1
libavcodec/smvjpegdec.c View File

@@ -184,7 +184,7 @@ static av_cold int smvjpeg_decode_end(AVCodecContext *avctx)
jpg->picture_ptr = NULL;
av_frame_free(&s->picture[0]);
av_frame_free(&s->picture[1]);
ff_codec_close_recursive(s->avctx);
avcodec_close(s->avctx);
av_freep(&s->avctx);
return 0;
}


+ 0
- 9
libavcodec/utils.c View File

@@ -2677,15 +2677,6 @@ void avsubtitle_free(AVSubtitle *sub)
memset(sub, 0, sizeof(AVSubtitle));
}

av_cold int ff_codec_close_recursive(AVCodecContext *avctx)
{
int ret = 0;

ret = avcodec_close(avctx);

return ret;
}

av_cold int avcodec_close(AVCodecContext *avctx)
{
if (!avctx)


Loading…
Cancel
Save