projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
954a8f4
)
lavd/pulse_audio_enc: add pointer checks
author
Lukasz Marek
<lukasz.m.luki2@gmail.com>
Tue, 29 Apr 2014 22:23:14 +0000
(
00:23
+0200)
committer
Lukasz Marek
<lukasz.m.luki2@gmail.com>
Tue, 29 Apr 2014 22:35:42 +0000
(
00:35
+0200)
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
libavdevice/pulse_audio_enc.c
patch
|
blob
|
history
diff --git
a/libavdevice/pulse_audio_enc.c
b/libavdevice/pulse_audio_enc.c
index 8acbe8b99fbadb1ce9bc9f5e4639da1bdbb67d8b..b8c77db85c19aa00dad7d57ff62c9622a92e1628 100644
(file)
--- a/
libavdevice/pulse_audio_enc.c
+++ b/
libavdevice/pulse_audio_enc.c
@@
-692,8
+692,10
@@
static void pulse_get_output_timestamp(AVFormatContext *h, int stream, int64_t *
pa_threaded_mainloop_lock(s->mainloop);
pa_stream_get_latency(s->stream, &latency, &neg);
pa_threaded_mainloop_unlock(s->mainloop);
- *wall = av_gettime();
- *dts = s->timestamp - (neg ? -latency : latency);
+ if (wall)
+ *wall = av_gettime();
+ if (dts)
+ *dts = s->timestamp - (neg ? -latency : latency);
}
static int pulse_get_device_list(AVFormatContext *h, AVDeviceInfoList *device_list)