diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-12 01:25:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-12 01:25:37 +0100 |
| commit | 7fad19a63dc52db4bf2bebbd9d261675956b1b34 (patch) | |
| tree | 8997428f45d54f3177dc6cd208d0375daa6fe201 /libavdevice | |
| parent | 16abd687798bbf9192ba4954765e61de96065b8b (diff) | |
| parent | 599b4c6efddaed33b1667c386b34b07729ba732b (diff) | |
| download | ffmpeg-7fad19a63dc52db4bf2bebbd9d261675956b1b34.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: cabac: replace explicit memory references with "m" operands
avplay: don't request a stereo downmix
wmapro: use av_float2int()
lavc: avoid invalid memcpy() in avcodec_default_release_buffer()
lavu: replace int/float punning functions
lavfi: install libavfilter/vsrc_buffer.h
Remove extraneous semicolons
sdp: Restore the original mp4 format h264 extradata if converted
rtpenc: Add support for mp4 format h264
rtpenc: Simplify code by introducing a separate end pointer
movenc: Use the actual converted sample for RTP hinting
Fix a bunch of common typos.
Conflicts:
doc/developer.texi
doc/eval.texi
doc/filters.texi
doc/protocols.texi
ffmpeg.c
ffplay.c
libavcodec/mpegvideo.h
libavcodec/x86/cabac.h
libavfilter/Makefile
libavformat/avformat.h
libavformat/cafdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/gxfenc.c
libavformat/img2.c
libavformat/movenc.c
libavformat/mpegts.c
libavformat/rtpenc_h264.c
libavformat/utils.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/jack_audio.c | 2 | ||||
| -rw-r--r-- | libavdevice/timefilter.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c index b1077c4ebe..d0a09ee218 100644 --- a/libavdevice/jack_audio.c +++ b/libavdevice/jack_audio.c @@ -272,7 +272,7 @@ static int audio_read_packet(AVFormatContext *context, AVPacket *pkt) } } - /* Wait for a packet comming back from process_callback(), if one isn't available yet */ + /* Wait for a packet coming back from process_callback(), if one isn't available yet */ timeout.tv_sec = av_gettime() / 1000000 + 2; if (sem_timedwait(&self->packet_count, &timeout)) { if (errno == ETIMEDOUT) { diff --git a/libavdevice/timefilter.h b/libavdevice/timefilter.h index 4580904092..2a77946e99 100644 --- a/libavdevice/timefilter.h +++ b/libavdevice/timefilter.h @@ -72,7 +72,7 @@ TimeFilter * ff_timefilter_new(double clock_period, double feedback2_factor, dou * * system_time, in seconds, should be the value of the system clock time, * at (or as close as possible to) the moment the device hardware interrupt - * occured (or any other event the device clock raises at the beginning of a + * occurred (or any other event the device clock raises at the beginning of a * cycle). * * @return the filtered time, in seconds |