highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

doc/examples/mux: rename alloc_picture to alloc_frame

Browse Source 
The new name is consistent with the updated API.
This commit is contained in:
Stefano Sabatini
2023-03-05 18:59:10 +01:00
parent dcf963f490
commit cd0d267b92
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
doc/examples/mux.c
View File

@@ -379,27 +379,27 @@ static int write_audio_frame(AVFormatContext *oc, OutputStream *ost)
/**************************************************************/ /**************************************************************/
/* video output */ /* video output */
static AVFrame *alloc_picture(enum AVPixelFormat pix_fmt, int width, int height) static AVFrame *alloc_frame(enum AVPixelFormat pix_fmt, int width, int height)
{ {
AVFrame *picture; AVFrame *frame;
int ret; int ret;
picture = av_frame_alloc(); frame = av_frame_alloc();
if (!picture) if (!frame)
return NULL; return NULL;
picture->format = pix_fmt; frame->format = pix_fmt;
picture->width = width; frame->width = width;
picture->height = height; frame->height = height;
/* allocate the buffers for the frame data */ /* allocate the buffers for the frame data */
ret = av_frame_get_buffer(picture, 0); ret = av_frame_get_buffer(frame, 0);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Could not allocate frame data.\n"); fprintf(stderr, "Could not allocate frame data.\n");
exit(1); exit(1);
} }
return picture; return frame;
} }
static void open_video(AVFormatContext *oc, const AVCodec *codec, static void open_video(AVFormatContext *oc, const AVCodec *codec,
@@ -420,7 +420,7 @@ static void open_video(AVFormatContext *oc, const AVCodec *codec,
} }
/* allocate and init a re-usable frame */ /* allocate and init a re-usable frame */
ost->frame = alloc_picture(c->pix_fmt, c->width, c->height); ost->frame = alloc_frame(c->pix_fmt, c->width, c->height);
if (!ost->frame) { if (!ost->frame) {
fprintf(stderr, "Could not allocate video frame\n"); fprintf(stderr, "Could not allocate video frame\n");
exit(1); exit(1);
@@ -431,9 +431,9 @@ static void open_video(AVFormatContext *oc, const AVCodec *codec,
* output format. */ * output format. */
ost->tmp_frame = NULL; ost->tmp_frame = NULL;
if (c->pix_fmt != AV_PIX_FMT_YUV420P) { if (c->pix_fmt != AV_PIX_FMT_YUV420P) {
ost->tmp_frame = alloc_picture(AV_PIX_FMT_YUV420P, c->width, c->height); ost->tmp_frame = alloc_frame(AV_PIX_FMT_YUV420P, c->width, c->height);
if (!ost->tmp_frame) { if (!ost->tmp_frame) {
fprintf(stderr, "Could not allocate temporary picture\n"); fprintf(stderr, "Could not allocate temporary video frame\n");
exit(1); exit(1);
} }
} }