ffmpeg/libavdevice
Michael Niedermayer b404ab9e74 Merge remote-tracking branch 'qatar/master'
* 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>
2011-12-06 01:37:27 +01:00
..
Makefile pulse: introduce pulseaudio input 2011-10-26 16:39:33 -07:00
alldevices.c pulse: introduce pulseaudio input 2011-10-26 16:39:33 -07:00
alsa-audio-common.c Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +01:00
alsa-audio-dec.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +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 Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
avdevice.c
avdevice.h pulse: introduce pulseaudio input 2011-10-26 16:39:33 -07:00
bktr.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
dshow.c lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
dshow.h dshow: add audio/video options 2011-09-16 11:06:56 +02:00
dshow_common.c dshow: add audio/video options 2011-09-16 11:06:56 +02:00
dshow_enummediatypes.c
dshow_enumpins.c dshow: cleanup internal references on capture interface 2011-09-16 11:16:05 +02:00
dshow_filter.c dshow: cleanup internal references on capture interface 2011-09-16 11:16:05 +02:00
dshow_pin.c dshow: release pin on disconnect 2011-09-16 11:16:05 +02:00
dv1394.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
dv1394.h
fbdev.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
jack_audio.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
lavfi.c lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
libavdevice.v
libcdio.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
libdc1394.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
openal-dec.c lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
oss_audio.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
pulse.c Merge remote-tracking branch 'qatar/master' 2011-12-06 01:37:27 +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' 2011-12-01 02:54:24 +01:00
sndio_enc.c
timefilter.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
timefilter.h Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
v4l.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
v4l2.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
vfwcap.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
x11grab.c Merge remote-tracking branch 'qatar/master' 2011-12-06 01:37:27 +01:00