diff --git a/avconv.c b/avconv.c
index 908a0c75da..0cbbcb1ff2 100644
--- a/avconv.c
+++ b/avconv.c
@@ -182,7 +182,7 @@ static void avconv_cleanup(int ret)
             bsfc = next;
         }
         output_streams[i]->bitstream_filters = NULL;
-        avcodec_free_frame(&output_streams[i]->filtered_frame);
+        av_frame_free(&output_streams[i]->filtered_frame);
 
         av_parser_close(output_streams[i]->parser);
 
diff --git a/avplay.c b/avplay.c
index 96e0cf2d9e..1cec241c20 100644
--- a/avplay.c
+++ b/avplay.c
@@ -2152,7 +2152,7 @@ static void stream_component_close(VideoState *is, int stream_index)
             avresample_free(&is->avr);
         av_freep(&is->audio_buf1);
         is->audio_buf = NULL;
-        avcodec_free_frame(&is->frame);
+        av_frame_free(&is->frame);
 
         if (is->rdft) {
             av_rdft_end(is->rdft);
diff --git a/doc/examples/output.c b/doc/examples/output.c
index 2cd11f2ddc..06fdf509ac 100644
--- a/doc/examples/output.c
+++ b/doc/examples/output.c
@@ -163,7 +163,7 @@ static void write_audio_frame(AVFormatContext *oc, AVStream *st)
         fprintf(stderr, "Error while writing audio frame\n");
         exit(1);
     }
-    avcodec_free_frame(&frame);
+    av_frame_free(&frame);
 }
 
 static void close_audio(AVFormatContext *oc, AVStream *st)
diff --git a/libavcodec/api-example.c b/libavcodec/api-example.c
index 54a1ecaa3c..11a4412abb 100644
--- a/libavcodec/api-example.c
+++ b/libavcodec/api-example.c
@@ -212,7 +212,7 @@ static void audio_encode_example(const char *filename)
     fclose(f);
 
     av_freep(&samples);
-    avcodec_free_frame(&frame);
+    av_frame_free(&frame);
     avcodec_close(c);
     av_free(c);
 }
@@ -308,7 +308,7 @@ static void audio_decode_example(const char *outfilename, const char *filename)
 
     avcodec_close(c);
     av_free(c);
-    avcodec_free_frame(&decoded_frame);
+    av_frame_free(&decoded_frame);
 }
 
 /*
@@ -432,7 +432,7 @@ static void video_encode_example(const char *filename)
     avcodec_close(c);
     av_free(c);
     av_freep(&picture->data[0]);
-    avcodec_free_frame(&picture);
+    av_frame_free(&picture);
     printf("\n");
 }
 
@@ -568,7 +568,7 @@ static void video_decode_example(const char *outfilename, const char *filename)
 
     avcodec_close(c);
     av_free(c);
-    avcodec_free_frame(&picture);
+    av_frame_free(&picture);
     printf("\n");
 }
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index ea1d927b52..36770d9b80 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1995,7 +1995,7 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **option
     }
 
 fail:
-    avcodec_free_frame(&frame);
+    av_frame_free(&frame);
     return ret;
 }