RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 08:12:44 +00:00
Code Issues Projects Releases Wiki Activity
91eb1b1525
ffmpeg/libavdevice
History
Michael Niedermayer f884ef00de Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  tiffenc: initialize forgotten avctx.
  avplay: free the active audio packet at exit.
  avplay: free rdft data used for spectrogram analysis.
  log.h: make AVClass a named struct
  fix ac3 encoder documentation
  vc1: more prettyprinting cosmetics
  vc1: prettyprint some tables
  vc1: K&R formatting cosmetics
  AVOptions: bump minor and add APIchanges entry.
  cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
  AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
  Remove all uses of deprecated AVOptions API.
  AVOptions: add av_opt_next, deprecate av_next_option.
  AVOptions: add functions for evaluating option strings.
  AVOptions: split get_number().
  AVOptions: add av_opt_get*, deprecate av_get*.
  AVOptions: add av_opt_set*().
  AVOptions: add new API for enumerating children.
  rv34: move inverse transform functions to DSP context
  flvenc: Write the right metadata entry count
  ...

Conflicts:
	avconv.c
	cmdutils.c
	doc/APIchanges
	ffplay.c
	ffprobe.c
	libavcodec/ac3dec.c
	libavcodec/h264.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/mpeg12enc.c
	libavcodec/options.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavfilter/vf_drawtext.c
	libavformat/flvdec.c
	libavformat/mpegtsenc.c
	libavformat/options.c
	libavutil/avutil.h
	libavutil/opt.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-13 06:00:03 +02:00
..
alldevices.c Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
alsa-audio-common.c Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
alsa-audio-dec.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
alsa-audio-enc.c Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
alsa-audio.h alsa: increase max buffer size 2011-09-12 06:16:40 +02:00
avdevice.c
avdevice.h Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
bktr.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +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
dshow.c dshow: remove filters from graph before releasing them 2011-09-16 11:16:05 +02:00
dshow.h dshow: add audio/video options 2011-09-16 11:06:56 +02:00
dv1394.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
dv1394.h
fbdev.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
jack_audio.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
lavfi.c lavdev/lavfi: reindent after the last commit 2011-09-16 21:22:11 +02:00
libavdevice.v
libcdio.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
libdc1394.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
openal-dec.c openal-dec: fix missing list_devices unit for list_devices AVOption 2011-09-02 05:28:31 +02:00
oss_audio.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
sdl.c
sndio_common.c
sndio_common.h
sndio_dec.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
sndio_enc.c
v4l2.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
v4l.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
vfwcap.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
x11grab.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00