projects
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
0b23d68
)
av_free* cleanup
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 18 Aug 2006 08:05:24 +0000
(08:05 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 18 Aug 2006 08:05:24 +0000
(08:05 +0000)
Originally committed as revision 6019 to svn://svn.ffmpeg.org/ffmpeg/trunk
vhook/watermark.c
patch
|
blob
|
blame
|
history
diff --git
a/vhook/watermark.c
b/vhook/watermark.c
index
e88dd1b
..
c64e93a
100644
(file)
--- a/
vhook/watermark.c
+++ b/
vhook/watermark.c
@@
-102,8
+102,7
@@
void Release(void *ctx)
if (ci) get_watermark_picture(ci, 1);
- if (ctx)
- av_free(ctx);
+ av_free(ctx);
}
@@
-556,14
+555,8
@@
int get_watermark_picture(ContextInfo *ci, int cleanup)
if (0 != cleanup)
{
// Free the RGB image
- if (0 != ci->buffer) {
- av_free(ci->buffer);
- ci->buffer = 0;
- }
- if (0 != ci->pFrameRGB) {
- av_free(ci->pFrameRGB);
- ci->pFrameRGB = 0;
- }
+ av_freep(&ci->buffer);
+ av_freep(&ci->pFrameRGB);
// Close the codec
if (0 != ci->pCodecCtx) {