1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavdevice
Michael Niedermayer 4480edcf31 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  w32threads: Make pthread_cond_wait follow POSIX
  cosmetics: Consistently place static, inline and av_cold attributes/keywords.
  sbrdsp: Use standard multiple inclusion guards.
  pcm: K&R formatting cosmetics
  rawdec: Support fourccs YV16 and YV24
  rtmp: implement bandwidth notification
  rtmp: update supported audio codecs value

Conflicts:
	libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 21:17:52 +02:00
..
alldevices.c devices: Disable v4l to fix compilation until someone 2012-01-28 08:44:33 +01:00
alsa-audio-common.c Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +01:00
alsa-audio-dec.c alsa: fix timefilter usage. 2012-03-05 16:57:28 +01:00
alsa-audio-enc.c lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
alsa-audio.h alsa: fix timefilter usage. 2012-03-05 16:57:28 +01:00
avdevice.c libavdevice: increase LIBAVDEVICE_VERSION_MICRO to 100 2011-12-22 03:06:33 +01:00
avdevice.h Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
bktr.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c dshow_filter: fix compilation with mingw-w64 2012-02-16 23:25:59 +01:00
dshow_pin.c dshow_filter: fix compilation with mingw-w64 2012-02-16 23:25:59 +01:00
dshow.c dshow: use DirectShow information to set time_base 2012-02-03 18:12:29 +01:00
dshow.h
dv1394.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dv1394.h cleanup: for(int 2011-12-13 21:08:43 +01:00
fbdev.c Merge remote-tracking branch 'qatar/master' 2012-04-04 21:17:52 +02:00
jack_audio.c timefilter: internally compute feedback factors. 2012-03-05 16:57:27 +01:00
lavfi.c lavd/lavfi: support all sample formats. 2012-02-22 11:37:32 +01:00
libavdevice.v
libcdio.c libcdio: add a forgotten AVClass to the private context. 2012-03-04 21:01:41 +01:00
libdc1394.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
Makefile v4l2: allow to convert monotonic timestamps. 2012-04-04 15:22:44 +02:00
openal-dec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
oss_audio.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
pulse.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
sdl.c Make sdl_overlay_pix_fmt_map static const. 2011-11-05 15:37:02 +01:00
sndio_common.c
sndio_common.h
sndio_dec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
sndio_enc.c
timefilter.c timefilter: allow to evaluate at other times. 2012-04-04 14:32:44 +02:00
timefilter.h timefilter: allow to evaluate at other times. 2012-04-04 14:32:44 +02:00
v4l2.c v4l2: allow to convert monotonic timestamps. 2012-04-04 15:22:44 +02:00
v4l.c v4l: fix compilation 2012-01-25 00:13:35 +01:00
vfwcap.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
x11grab.c x11grab: fix compilation 2012-03-18 01:12:03 +01:00