diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 00:00:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 00:01:23 +0100 |
| commit | 29c83d23e8edf47ce423f85d4a2f2081a674a940 (patch) | |
| tree | 90252f95122f3e91f9f6c0378f0c9835241881b5 /libavcodec/utils.c | |
| parent | 0ee905e243078cd4dfb3afa32777129aeee3bddb (diff) | |
| parent | b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d (diff) | |
| download | ffmpeg-29c83d23e8edf47ce423f85d4a2f2081a674a940.tar.gz | |
Merge commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d'
* commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d':
lavc: deprecate avcodec_alloc_frame().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index cf45607cc7..9c4c154c8a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1070,6 +1070,7 @@ void avcodec_get_frame_defaults(AVFrame *frame) av_frame_set_colorspace(frame, AVCOL_SPC_UNSPECIFIED); } +#if FF_API_AVFRAME_LAVC AVFrame *avcodec_alloc_frame(void) { AVFrame *frame = av_malloc(sizeof(AVFrame)); @@ -1082,6 +1083,7 @@ AVFrame *avcodec_alloc_frame(void) return frame; } +#endif void avcodec_free_frame(AVFrame **frame) { |