[FFmpeg-cvslog] lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults
Anton Khirnov
git at videolan.org
Tue Sep 25 15:19:13 CEST 2012
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Sep 21 08:28:49 2012 +0200| [a83499b13b5bbe7289f33b757313efe83b7698fb] | committer: Anton Khirnov
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.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a83499b13b5bbe7289f33b757313efe83b7698fb
---
libavcodec/avcodec.h | 4 ++--
libavcodec/utils.c | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c5cdf41..2bb308f 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3267,9 +3267,9 @@ AVFrame *avcodec_alloc_frame(void);
/**
* Set the fields of the given AVFrame to default values.
*
- * @param pic The AVFrame of which the fields should be set to default values.
+ * @param frame The AVFrame of which the fields should be set to default values.
*/
-void avcodec_get_frame_defaults(AVFrame *pic);
+void avcodec_get_frame_defaults(AVFrame *frame);
/**
* Initialize the AVCodecContext to use the given AVCodec. Prior to using this
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index b35ef51..7ef8581 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)
More information about the ffmpeg-cvslog
mailing list