Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'

* commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9':
  Replace all uses of avcodec_free_frame with av_frame_free().

Conflicts:
	doc/examples/decoding_encoding.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

4 files changed, 7 insertions, 7 deletions

diff --git a/doc/examples/decoding_encoding.c b/doc/examples/decoding_encoding.c
index 99aeb1c8ac..9b20c020a5 100644
--- a/doc/examples/decoding_encoding.c
+++ b/doc/examples/decoding_encoding.c
@@ -227,7 +227,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);
 }
@@ -329,7 +329,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);
 }
 
 /*
@@ -467,7 +467,7 @@ static void video_encode_example(const char *filename, int codec_id)
     avcodec_close(c);
     av_free(c);
     av_freep(&frame->data[0]);
-    avcodec_free_frame(&frame);
+    av_frame_free(&frame);
     printf("\n");
 }
 
@@ -609,7 +609,7 @@ static void video_decode_example(const char *outfilename, const char *filename)
 
     avcodec_close(c);
     av_free(c);
-    avcodec_free_frame(&frame);
+    av_frame_free(&frame);
     printf("\n");
 }
 
diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c
index 4276114306..9ad6e28281 100644
--- a/doc/examples/muxing.c
+++ b/doc/examples/muxing.c
@@ -280,7 +280,7 @@ static void write_audio_frame(AVFormatContext *oc, AVStream *st)
                 av_err2str(ret));
         exit(1);
     }
-    avcodec_free_frame(&frame);
+    av_frame_free(&frame);
 }
 
 static void close_audio(AVFormatContext *oc, AVStream *st)
diff --git a/ffmpeg.c b/ffmpeg.c
index 6411ce3039..e68620c3ab 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -468,7 +468,7 @@ static void ffmpeg_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/libavformat/utils.c b/libavformat/utils.c
index 838ee18381..589eb532f2 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2533,7 +2533,7 @@ static int try_decode_frame(AVFormatContext *s, AVStream *st, AVPacket *avpkt, A
         ret = -1;
 
 fail:
-    avcodec_free_frame(&frame);
+    av_frame_free(&frame);
     return ret;
 }