projects
/
libam7xxx.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dda0355
)
am7xxx-play: port to libav10
author
Antonio Ospite <ao2@ao2.it>
Mon, 12 May 2014 21:02:28 +0000
(23:02 +0200)
committer
Antonio Ospite <ao2@ao2.it>
Mon, 12 May 2014 21:02:28 +0000
(23:02 +0200)
examples/am7xxx-play.c
patch
|
blob
|
history
diff --git
a/examples/am7xxx-play.c
b/examples/am7xxx-play.c
index
4f9a505
..
2fa615a
100644
(file)
--- a/
examples/am7xxx-play.c
+++ b/
examples/am7xxx-play.c
@@
-223,8
+223,8
@@
static int video_output_init(struct video_output_ctx *output_ctx,
goto out;
}
goto out;
}
- output_codec_ctx->pix_fmt = PIX_FMT_YUVJ420P;
- output_codec_ctx->codec_id = CODEC_ID_MJPEG;
+ output_codec_ctx->pix_fmt =
AV_
PIX_FMT_YUVJ420P;
+ output_codec_ctx->codec_id =
AV_
CODEC_ID_MJPEG;
output_codec_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
/* Set quality and other VBR settings */
output_codec_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
/* Set quality and other VBR settings */
@@
-306,7
+306,7
@@
static int am7xxx_play(const char *input_format_string,
}
/* allocate an input frame */
}
/* allocate an input frame */
- picture_raw = av
codec_alloc_frame
();
+ picture_raw = av
_frame_alloc
();
if (picture_raw == NULL) {
fprintf(stderr, "cannot allocate the raw picture frame!\n");
ret = -ENOMEM;
if (picture_raw == NULL) {
fprintf(stderr, "cannot allocate the raw picture frame!\n");
ret = -ENOMEM;
@@
-314,7
+314,7
@@
static int am7xxx_play(const char *input_format_string,
}
/* allocate output frame */
}
/* allocate output frame */
- picture_scaled = av
codec_alloc_frame
();
+ picture_scaled = av
_frame_alloc
();
if (picture_scaled == NULL) {
fprintf(stderr, "cannot allocate the scaled picture!\n");
ret = -ENOMEM;
if (picture_scaled == NULL) {
fprintf(stderr, "cannot allocate the scaled picture!\n");
ret = -ENOMEM;
@@
-449,9
+449,9
@@
end_while:
cleanup_out_buf:
av_free(out_buf);
cleanup_picture_scaled:
cleanup_out_buf:
av_free(out_buf);
cleanup_picture_scaled:
- av_fr
ee(
picture_scaled);
+ av_fr
ame_free(&
picture_scaled);
cleanup_picture_raw:
cleanup_picture_raw:
- av_fr
ee(
picture_raw);
+ av_fr
ame_free(&
picture_raw);
cleanup_output:
/* av_free is needed as well,
cleanup_output:
/* av_free is needed as well,