diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:24:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:24:48 +0100 |
| commit | 409a143e4b49b9d1176aaf6c76da536ffd90152b (patch) | |
| tree | b86750605571984a18ceff6eff36113f728c45df /libavcodec/utils.c | |
| parent | 4cbf3eb9e6a88426da255a00305b5858070d192a (diff) | |
| parent | 943135621830ac3857d3cf766cfc280a95bb3c13 (diff) | |
| download | ffmpeg-409a143e4b49b9d1176aaf6c76da536ffd90152b.tar.gz | |
Merge commit '943135621830ac3857d3cf766cfc280a95bb3c13'
* commit '943135621830ac3857d3cf766cfc280a95bb3c13':
lavc: deprecate avcodec_free_frame()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 59f7d7563f..fb6fa9234a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1087,22 +1087,12 @@ AVFrame *avcodec_alloc_frame(void) return frame; } -#endif void avcodec_free_frame(AVFrame **frame) { - AVFrame *f; - - if (!frame || !*frame) - return; - - f = *frame; - - if (f->extended_data != f->data) - av_freep(&f->extended_data); - - av_freep(frame); + av_frame_free(frame); } +#endif MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase) MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor) |