summaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2012-08-02 13:14:15 +0200
committerStefano Sabatini <stefasab@gmail.com>2012-08-03 16:28:18 +0200
commit44bd69e9b9db4adbf76512d4d7769cf019179fa3 (patch)
tree80cdb2f0cf83fe978e2cb3b914ec88f5bb5d0855 /libavcodec/utils.c
parentb99381e8b5355bdf26a9f03064a7a7e4fe1415e8 (diff)
downloadffmpeg-streaming-44bd69e9b9db4adbf76512d4d7769cf019179fa3.zip
ffmpeg-streaming-44bd69e9b9db4adbf76512d4d7769cf019179fa3.tar.gz
lavc/utils: rename ff_init_buffer_info() pic parameter to frame
The new name is more expressive, given that the frame is not necessarily a picture but may be an audio frame.
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 4e729a4..529d3ab 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -289,31 +289,31 @@ void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){
*width=FFALIGN(*width, align);
}
-void ff_init_buffer_info(AVCodecContext *s, AVFrame *pic)
+void ff_init_buffer_info(AVCodecContext *s, AVFrame *frame)
{
if (s->pkt) {
- pic->pkt_pts = s->pkt->pts;
- pic->pkt_pos = s->pkt->pos;
- pic->pkt_duration = s->pkt->duration;
+ frame->pkt_pts = s->pkt->pts;
+ frame->pkt_pos = s->pkt->pos;
+ frame->pkt_duration = s->pkt->duration;
} else {
- pic->pkt_pts = AV_NOPTS_VALUE;
- pic->pkt_pos = -1;
- pic->pkt_duration = 0;
+ frame->pkt_pts = AV_NOPTS_VALUE;
+ frame->pkt_pos = -1;
+ frame->pkt_duration = 0;
}
- pic->reordered_opaque= s->reordered_opaque;
+ frame->reordered_opaque = s->reordered_opaque;
switch (s->codec->type) {
case AVMEDIA_TYPE_VIDEO:
- pic->width = s->width;
- pic->height = s->height;
- pic->format = s->pix_fmt;
- pic->sample_aspect_ratio = s->sample_aspect_ratio;
+ frame->width = s->width;
+ frame->height = s->height;
+ frame->format = s->pix_fmt;
+ frame->sample_aspect_ratio = s->sample_aspect_ratio;
break;
case AVMEDIA_TYPE_AUDIO:
- pic->sample_rate = s->sample_rate;
- pic->format = s->sample_fmt;
- pic->channel_layout = s->channel_layout;
- pic->channels = s->channels;
+ frame->sample_rate = s->sample_rate;
+ frame->format = s->sample_fmt;
+ frame->channel_layout = s->channel_layout;
+ frame->channels = s->channels;
break;
}
}
OpenPOWER on IntegriCloud