apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-31 20:42:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-12-11 23:18:21 +01:00
parent dee6d5f51c eb891b3114
commit 4cbf3eb9e6
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/examples/decoding_encoding.c
View File

@@ -227,7 +227,7 @@ static void audio_encode_example(const char *filename)
fclose(f); fclose(f);
av_freep(&samples); av_freep(&samples);
avcodec_free_frame(&frame); av_frame_free(&frame);
avcodec_close(c); avcodec_close(c);
av_free(c); av_free(c);
} }
@@ -329,7 +329,7 @@ static void audio_decode_example(const char *outfilename, const char *filename)
avcodec_close(c); avcodec_close(c);
av_free(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); avcodec_close(c);
av_free(c); av_free(c);
av_freep(&frame->data[0]); av_freep(&frame->data[0]);
avcodec_free_frame(&frame); av_frame_free(&frame);
printf("\n"); printf("\n");
} }
@@ -609,7 +609,7 @@ static void video_decode_example(const char *outfilename, const char *filename)
avcodec_close(c); avcodec_close(c);
av_free(c); av_free(c);
avcodec_free_frame(&frame); av_frame_free(&frame);
printf("\n"); printf("\n");
} }

2
doc/examples/muxing.c
View File

@@ -280,7 +280,7 @@ static void write_audio_frame(AVFormatContext *oc, AVStream *st)
av_err2str(ret)); av_err2str(ret));
exit(1); exit(1);
} }
avcodec_free_frame(&frame); av_frame_free(&frame);
} }
static void close_audio(AVFormatContext *oc, AVStream *st) static void close_audio(AVFormatContext *oc, AVStream *st)

2
ffmpeg.c
View File

@@ -468,7 +468,7 @@ static void ffmpeg_cleanup(int ret)
bsfc = next; bsfc = next;
} }
output_streams[i]->bitstream_filters = NULL; 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); av_parser_close(output_streams[i]->parser);

2
libavformat/utils.c
View File

@@ -2533,7 +2533,7 @@ static int try_decode_frame(AVFormatContext *s, AVStream *st, AVPacket *avpkt, A
ret = -1; ret = -1;
fail: fail:
avcodec_free_frame(&frame); av_frame_free(&frame);
return ret; return ret;
} }