diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-17 23:16:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-17 23:16:05 +0100 |
| commit | 967bdb8572f27b9891fe7bd9b8489146a906633d (patch) | |
| tree | 61b486be897a4503f71e2ecc7734f16930dc1a94 /libavdevice | |
| parent | 219a6fb61cb9e6f534f20dc3313442f89b0ffd42 (diff) | |
| parent | 6ca3b248e21fc48418c4221fc92c2eecaf07cb9b (diff) | |
| download | ffmpeg-967bdb8572f27b9891fe7bd9b8489146a906633d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
resample: allocate a large enough output buffer
fate: fix enc_dec_pcm tests with remote target
wmaenc: remove bit-exact hack
FATE: remove WMA acodec tests
FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison
FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison
qtrle: Use bytestream2 functions to prevent buffer overreads.
vqavideo: check malloc return values
x11grab: fix a memory leak exposed by valgrind
threads: fix old frames returned after avcodec_flush_buffers()
MPV: always mark dummy frames as reference
h264: fix deadlocks on incomplete reference frame decoding.
mpeg4: report frame decoding completion at ff_MPV_frame_end().
mimic: don't use self as reference, and report completion at end of decode().
Conflicts:
libavcodec/h264.c
libavcodec/qtrle.c
libavcodec/resample.c
libavcodec/vqavideo.c
libavdevice/x11grab.c
tests/ref/seek/wmav1_asf
tests/ref/seek/wmav2_asf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/x11grab.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 0835fb2e44..48d5118b4a 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -169,6 +169,9 @@ x11grab_read_header(AVFormatContext *s1) AVRational framerate; dpyname = av_strdup(s1->filename); + if (!dpyname) + goto out; + offset = strchr(dpyname, '+'); if (offset) { sscanf(offset, "%d,%d", &x_off, &y_off); @@ -320,6 +323,7 @@ x11grab_read_header(AVFormatContext *s1) st->codec->bit_rate = x11grab->frame_size * 1/av_q2d(x11grab->time_base) * 8; out: + av_free(param); return ret; } |