diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-28 20:45:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-28 20:45:06 +0200 |
| commit | 9d7c1b4cf36737bde226d0f7bb4e271e61e4e8a6 (patch) | |
| tree | 07577504efcb323108e1fcb6d76499a863386589 /libavformat/aviobuf.c | |
| parent | c31be45e144a5f4748c9b9d5b8802f254550a471 (diff) | |
| parent | 9b9df1cdff149db5bbe6726b236934c5b5fbe21d (diff) | |
| download | ffmpeg-9d7c1b4cf36737bde226d0f7bb4e271e61e4e8a6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: new assembly version of get_cabac for x86_64 with PIC
h264: use one table instead of several for cabac functions
h264: (trivial) remove unneeded macro argument in x86/cabac.h
libschroedingerdec: check malloc
segment: reorder seg_write_header allocation
avio: make avio_close(NULL) a no-op
mov: Parse EC3SpecificBox (dec3 atom).
Conflicts:
libavcodec/cabac.c
libavcodec/x86/cabac.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aviobuf.c')
| -rw-r--r-- | libavformat/aviobuf.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 2f57c55e5b..45a8bad37e 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -785,8 +785,12 @@ int avio_open2(AVIOContext **s, const char *filename, int flags, int avio_close(AVIOContext *s) { - URLContext *h = s->opaque; + URLContext *h; + + if (!s) + return 0; + h = s->opaque; av_free(s->buffer); av_free(s); return ffurl_close(h); |