diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-02-03 02:09:36 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-02-03 01:37:55 +0000 |
| commit | 437fb1c87d7b4b0730db97d0858b4f39fffff2a9 (patch) | |
| tree | 1febadd59886886b0ad55bb8796a22160866bec3 /libavformat | |
| parent | dc75d6dbf2af3c03b33d3159e1dadccf22c076ea (diff) | |
| download | ffmpeg-437fb1c87d7b4b0730db97d0858b4f39fffff2a9.tar.gz | |
Remove a few if (p) av_free(p) forms
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtpdec_mpeg4.c | 3 | ||||
| -rw-r--r-- | libavformat/smacker.c | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index 137dbd2613..5498d1c46b 100644 --- a/libavformat/rtpdec_mpeg4.c +++ b/libavformat/rtpdec_mpeg4.c @@ -111,8 +111,7 @@ static int parse_fmtp_config(AVCodecContext * codec, char *value) { /* decode the hexa encoded parameter */ int len = ff_hex_to_data(NULL, value); - if (codec->extradata) - av_free(codec->extradata); + av_free(codec->extradata); codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); if (!codec->extradata) return AVERROR(ENOMEM); diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 71a968eed7..92da91e81e 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -334,12 +334,9 @@ static int smacker_read_close(AVFormatContext *s) int i; for(i = 0; i < 7; i++) - if(smk->bufs[i]) - av_free(smk->bufs[i]); - if(smk->frm_size) - av_free(smk->frm_size); - if(smk->frm_flags) - av_free(smk->frm_flags); + av_free(smk->bufs[i]); + av_free(smk->frm_size); + av_free(smk->frm_flags); return 0; } |