summaryrefslogtreecommitdiff
path: root/libavdevice/pulse.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-06
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mov: Don't av_malloc(0). avconv: only allocate 1 AVFrame per input stream avconv: fix memleaks due to not freeing the AVFrame for audio h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg). misc Doxygen markup improvements doxygen: eliminate Qt-style doxygen syntax g722: Add a regression test for muxing/demuxing in wav g722: Change bits per sample to 4 g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample api-example: update to use avcodec_decode_audio4() avplay: use avcodec_decode_audio4() avplay: use a separate buffer for playing silence avformat: use avcodec_decode_audio4() in avformat_find_stream_info() avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3() mov: Allow empty stts atom. doc: document preferred Doxygen syntax and make patcheck detect it Conflicts: avconv.c ffplay.c libavcodec/mlpdec.c libavcodec/version.h libavformat/mov.c tests/codec-regression.sh tests/fate/h264.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * misc Doxygen markup improvementsDiego Biurrun2011-12-05
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec: Templatize the code for different g726 bitrate variants rv40: move loop filter to rv34dsp context lavf: make av_set_pts_info private. rtpdec: Add support for G726 audio rtpdec: Add an init function that can do custom codec context initialization avconv: make copy_tb on by default. matroskadec: don't set codec timebase. rmdec: don't set codec timebase. avconv: compute next_pts from input packet duration when possible. lavf: estimate frame duration from r_frame_rate. avconv: update InputStream.pts in the streamcopy case. Conflicts: avconv.c libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/oss_audio.c libavdevice/v4l.c libavdevice/v4l2.c libavdevice/vfwcap.c libavdevice/x11grab.c libavformat/au.c libavformat/eacdata.c libavformat/flvdec.c libavformat/mpegts.c libavformat/mxfenc.c libavformat/rtpdec_g726.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: make av_set_pts_info private.Anton Khirnov2011-11-30
| | | | | | | | It's supposed to be called only from (de)muxers.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: binkvideo: simplify and remove invalid shifts pulse: compute frame_duration once and fix it lavf: simplify format_child_class_next() hwaccel: OS X Video Decoder Acceleration (VDA) support. doc: add support for an optional navigation bar in texi2html pages Conflicts: configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/vda.c libavcodec/vda.h libavcodec/vda_h264.c libavcodec/vda_internal.h libavcodec/version.h libavformat/options.c libavutil/avutil.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pulse: compute frame_duration once and fix itLuca Barbato2011-11-14
| | | | | | | | | | | | | | | | The frame duration was calculated without taking in account the bytes per sample. Thanks to Lorenzo Pistone <blaffablaffa@gmail.com> for pointing the issue and providing an initial fix.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: remove "legacy" mpegvideo decoder. iv8: assemble packets to return complete frames pulse: documentation pulse: introduce pulseaudio input remove the zork pcm seek test Conflicts: configure libavdevice/Makefile libavdevice/alldevices.c libavdevice/avdevice.h libavdevice/pulse.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pulse: introduce pulseaudio inputLuca Barbato2011-10-26
| | | | | | | It currently use the simple api and is using the latency information provided only to offset the stream start. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* Merge remote-tracking branch 'luzero/pulse'Michael Niedermayer2011-10-27
|\ | | | | | | | | | | | | | | | | | | * luzero/pulse: pulse: set the device from the avformat filename Conflicts: libavdevice/pulse.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pulse: set the device from the avformat filenameLuca Barbato2011-10-25
| | | | | | | | Cleanup the options and add explicit fragment_size avoption.
* | pulse: Change application name to LIBAVFORMAT_IDENTMichael Niedermayer2011-10-26
| | | | | | | | | | | | This should be changed to LIBAVDEVICE_IDENT once it exists. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pulse: fix application nameMichael Niedermayer2011-10-22
|/ | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* pulse: cosmeticsLuca Barbato2011-10-19
|
* pulse: introduce pulseaudio inputLuca Barbato2011-10-19
It currently use the simple api and is using the latency information provided only to offset the stream start.