am7xxx: simplify the device info caching operation in am7xxx_open_device()
[libam7xxx.git] / examples / am7xxx-play.c
index f5e6157..46a91c9 100644 (file)
@@ -339,11 +339,13 @@ static int am7xxx_play(const char *input_format_string,
        }
 
        /* assign appropriate parts of buffer to image planes in picture_scaled */
-       avpicture_fill((AVPicture *)picture_scaled,
-                      out_buf,
-                      (output_ctx.codec_ctx)->pix_fmt,
-                      (output_ctx.codec_ctx)->width,
-                      (output_ctx.codec_ctx)->height);
+       av_image_fill_arrays(picture_scaled->data,
+                            picture_scaled->linesize,
+                            out_buf,
+                            (output_ctx.codec_ctx)->pix_fmt,
+                            (output_ctx.codec_ctx)->width,
+                            (output_ctx.codec_ctx)->height,
+                            1);
 
        sw_scale_ctx = sws_getCachedContext(NULL,
                                            (input_ctx.codec_ctx)->width,
@@ -456,8 +458,8 @@ static int am7xxx_play(const char *input_format_string,
                }
 end_while:
                if (!output_ctx.raw_output && got_packet)
-                       av_free_packet(&out_packet);
-               av_free_packet(&in_packet);
+                       av_packet_unref(&out_packet);
+               av_packet_unref(&in_packet);
        }
 
        sws_freeContext(sw_scale_ctx);