summaryrefslogtreecommitdiff
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-09-21 08:28:49 +0200
committerAnton Khirnov <anton@khirnov.net>2012-09-24 12:31:24 +0200
commita83499b13b5bbe7289f33b757313efe83b7698fb (patch)
tree048d359a34ed887bbbf2434f65e8d9c0c5e3f462 /libavcodec/utils.c
parentcee1950bbb44acd215efd2101fb52d9605701969 (diff)
lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults
AVFrame is used for both audio and video, so calling the argument 'pic' is misleading.
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index b35ef51ac0..7ef858153b 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -633,26 +633,26 @@ enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum
return fmt[0];
}
-void avcodec_get_frame_defaults(AVFrame *pic)
+void avcodec_get_frame_defaults(AVFrame *frame)
{
- memset(pic, 0, sizeof(AVFrame));
+ memset(frame, 0, sizeof(AVFrame));
- pic->pts = AV_NOPTS_VALUE;
- pic->key_frame = 1;
- pic->sample_aspect_ratio = (AVRational) {0, 1 };
- pic->format = -1; /* unknown */
+ frame->pts = AV_NOPTS_VALUE;
+ frame->key_frame = 1;
+ frame->sample_aspect_ratio = (AVRational) {0, 1 };
+ frame->format = -1; /* unknown */
}
AVFrame *avcodec_alloc_frame(void)
{
- AVFrame *pic = av_malloc(sizeof(AVFrame));
+ AVFrame *frame = av_malloc(sizeof(AVFrame));
- if (pic == NULL)
+ if (frame == NULL)
return NULL;
- avcodec_get_frame_defaults(pic);
+ avcodec_get_frame_defaults(frame);
- return pic;
+ return frame;
}
int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options)