am7xxx: use debug() instead of fatal() in add_new_device()

[libam7xxx.git] / examples / am7xxx-play.c

diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
index 4f9a505..f63fbfd 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 = avcodec_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 = avcodec_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;


@@ -354,6 +354,7 @@ static int am7xxx_play(const char *input_format_string,
                goto cleanup_out_buf;
        }
 
                goto cleanup_out_buf;
        }
 

+       got_packet = 0;

        while (run) {
                /* read packet */
                ret = av_read_frame(input_ctx.format_ctx, &in_packet);
        while (run) {
                /* read packet */
                ret = av_read_frame(input_ctx.format_ctx, &in_packet);


@@ -381,11 +382,11 @@ static int am7xxx_play(const char *input_format_string,
                        goto end_while;
                }
 
                        goto end_while;
                }
 

-               /* if we get the complete frame */
+               /* if we got the complete frame */

                if (got_picture) {
                        /* convert it to YUV */
                        sws_scale(sw_scale_ctx,
                if (got_picture) {
                        /* convert it to YUV */
                        sws_scale(sw_scale_ctx,

-                                 (const uint8_t * const*)picture_raw->data,
+                                 (const uint8_t * const *)picture_raw->data,

                                  picture_raw->linesize,
                                  0,
                                  (input_ctx.codec_ctx)->height,
                                  picture_raw->linesize,
                                  0,
                                  (input_ctx.codec_ctx)->height,


@@ -449,9 +450,9 @@ end_while:
 cleanup_out_buf:
        av_free(out_buf);
 cleanup_picture_scaled:
 cleanup_out_buf:
        av_free(out_buf);
 cleanup_picture_scaled:

-       av_free(picture_scaled);
+       av_frame_free(&picture_scaled);

 cleanup_picture_raw:
 cleanup_picture_raw:

-       av_free(picture_raw);
+       av_frame_free(&picture_raw);

 
 cleanup_output:
        /* av_free is needed as well,
 
 cleanup_output:
        /* av_free is needed as well,