aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-17 14:03:38 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-07 21:28:41 +0100
commit304260a5722f45a99e26788ed5475a1fda6cfc17 (patch)
tree23142a2a01484bcb97372f2be52cfb25720aa386
parented621efb361b83db08a4ea741505660afd60fd30 (diff)
downloadffmpeg-304260a5722f45a99e26788ed5475a1fda6cfc17.tar.gz
avcodec/utils: implement avcodec_alloc_frame() through av_alloc_frame()
This ensures that theres just one AVFrame allocation function and libs dont produce multiple AVFrame variants after a minor lib update Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5abdda214df53f009434f19b9eb8e1375f2924d9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/utils.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 554b30edbf..c0f47cb67e 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1071,15 +1071,7 @@ void avcodec_get_frame_defaults(AVFrame *frame)
AVFrame *avcodec_alloc_frame(void)
{
- AVFrame *frame = av_malloc(sizeof(AVFrame));
-
- if (frame == NULL)
- return NULL;
-
- frame->extended_data = NULL;
- avcodec_get_frame_defaults(frame);
-
- return frame;
+ return av_frame_alloc();
}
void avcodec_free_frame(AVFrame **frame)