ffmpeg/libavdevice
Michael Niedermayer 653d117c29 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libschroedinger: Switch to function names more in line with Libav style.
  Move code shared between libdirac and libschroedinger to libschroedinger.
  lavfi: uninline avfilter_copy_buffer_ref_props().
  lavf: add missing '*' in a doxy.
  h264: Remove a commented-out function pointer typedef.
  txd: Remove write-only variable in txd_decode_frame().
  mmvideo.c: Remove unused variable in mm_decode_pal().
  build: cosmetics: Add missing end-of-line backslashes to item lists.
  build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
  libschroedinger: Move a function to avoid a forward declaration.
  pthread: warn on high thread counts
  vf_yadif: fix missing error handling for avfilter_poll_frame()
  avprobe: allow showing only one container/stream property.
  lavfi: support audio in avfilter_copy_frame_props().
  lavfi: avfilter_merge_formats: handle case where inputs are same
  lavc: add sample rate and channel layout to AVFrame.
  zerocodec: check if the previous frame is missing
  doc: clarify check for NULL pointer style

Conflicts:
	doc/APIchanges
	doc/developer.texi
	ffprobe.c
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/libdirac_libschro.c
	libavcodec/libdirac_libschro.h
	libavcodec/mmvideo.c
	libavcodec/txd.c
	libavcodec/version.h
	libavcodec/zerocodec.c
	libavfilter/Makefile
	libavfilter/avfilter.c
	libavfilter/version.h
	libavformat/Makefile
	libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-07 22:51:34 +02:00
..
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-07 22:51:34 +02:00
alldevices.c
alsa-audio-common.c
alsa-audio-dec.c alsa: fix timefilter usage. 2012-03-05 16:57:28 +01:00
alsa-audio-enc.c
alsa-audio.h alsa: fix timefilter usage. 2012-03-05 16:57:28 +01:00
avdevice.c
avdevice.h
bktr.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
dshow.c
dshow.h
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dv1394.c
dv1394.h
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
libavdevice.v
libcdio.c libcdio: add a forgotten AVClass to the private context. 2012-03-04 21:01:41 +01:00
libdc1394.c
openal-dec.c
oss_audio.c
pulse.c
sdl.c
sndio_common.c
sndio_common.h
sndio_dec.c
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
v4l.c
v4l2.c v4l2: allow to convert monotonic timestamps. 2012-04-04 15:22:44 +02:00
vfwcap.c
x11grab.c x11grab: fix compilation 2012-03-18 01:12:03 +01:00