RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-22 15:23:11 +00:00
Code Issues Projects Releases Wiki Activity
73bb4e9ca6
ffmpeg/libavdevice
History
Michael Niedermayer 039e9fe01c Merge remote-tracking branch 'qatar/master' 
* qatar/master: (29 commits)
  lavfi: reclassify showfiltfmts as a TESTPROG
  graph2dot: fix printf format specifier
  swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32.
  vp8: loopfilter >=sse2 functions need aligned stack on x86-32.
  amr: remove shift out of the AMR_BIT() macro.
  dsputilenc: group yasm and inline asm function pointer assignment.
  mov: use forward declaration of a function instead of a table.
  Clarify Doxygen comment for FF_API_* #defines.
  configure: simplify get_version()
  Create version.h headers for libraries that lack them
  gitignore: Use full path instead of relative path to specify patterns
  mpegvideo: remove VLAs
  Add XTEA encryption support in libavutil
  Add Blowfish encryption support in libavutil
  eval: Add the isinf() function and tests for it
  flacdec: move lpc filter to flacdsp
  flacdec: split off channel decorrelation as flacdsp
  avplay: Add an option for not limiting the input buffer size
  FATE: add a test for WMA cover art.
  FATE: add a test for apetag cover art
  ...

Conflicts:
	.gitignore
	configure
	ffplay.c
	libavcodec/Makefile
	libavcodec/error_resilience.c
	libavcodec/mpegvideo.c
	libavcodec/ratecontrol.c
	libavdevice/avdevice.h
	libavfilter/Makefile
	libavfilter/filtfmts.c
	libavfilter/version.h
	libavformat/mov.c
	libavformat/version.h
	libavutil/Makefile
	libavutil/avutil.h
	libavutil/version.h
	libswscale/swscale.h
	libswscale/x86/swscale_mmx.c
	tests/fate/libavutil.mak
	tests/lavfi-regression.sh
	tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-04 21:03:28 +02:00
..
alldevices.c
alsa-audio-common.c
alsa-audio-dec.c
alsa-audio-enc.c
alsa-audio.h
avdevice.c
avdevice.h Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
bktr.c bktr: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
dshow_capture.h dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_common.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_enummediatypes.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_enumpins.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_filter.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_pin.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dv1394.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
dv1394.h Merge remote-tracking branch 'qatar/master' 2012-06-15 00:14:21 +02:00
fbdev.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
jack_audio.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
lavfi.c lavfi: remove old video sink API 2012-06-26 11:40:08 +02:00
libavdevice.v
libcdio.c
libdc1394.c
Makefile Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
openal-dec.c
oss_audio.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
pulse.c
sdl.c sdl: fix aspect ratio computations. 2012-06-10 09:57:50 +02:00
sndio_common.c
sndio_common.h
sndio_dec.c
sndio_enc.c
timefilter.c
timefilter.h
v4l2.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
v4l.c
version.h Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
vfwcap.c
x11grab.c x11grab: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00