diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:18:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:18:51 +0100 |
| commit | 4cbf3eb9e6a88426da255a00305b5858070d192a (patch) | |
| tree | 321d2b32dcc9092a9d46e508b91ae8094b95c208 /libavformat/utils.c | |
| parent | dee6d5f51c72be11aae95caf02551fb94e02d6e7 (diff) | |
| parent | eb891b3114f499e96b9faddd0b0ae856345dfbd9 (diff) | |
| download | ffmpeg-4cbf3eb9e6a88426da255a00305b5858070d192a.tar.gz | |
Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'
* commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9':
Replace all uses of avcodec_free_frame with av_frame_free().
Conflicts:
doc/examples/decoding_encoding.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 838ee18381..589eb532f2 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2533,7 +2533,7 @@ static int try_decode_frame(AVFormatContext *s, AVStream *st, AVPacket *avpkt, A ret = -1; fail: - avcodec_free_frame(&frame); + av_frame_free(&frame); return ret; } |