eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'eb891b3114'

Browse source 
* commit 'eb891b3114':
  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
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);
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");
}