virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity
c3ff0713ef
FFmpeg/libavdevice
History
Michael Niedermayer 0e7fc3cafe Merge remote-tracking branch 'qatar/master' 
* qatar/master: (22 commits)
  rv34: frame-level multi-threading
  mpegvideo: claim ownership of referenced pictures
  aacsbr: prevent out of bounds memcpy().
  ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM
  sierravmd: fix audio pts
  bethsoftvideo: Use bytestream2 functions to prevent buffer overreads.
  bmpenc: support for PIX_FMT_RGB444
  swscale: fix crash in fast_bilinear code when compiled with -mred-zone.
  swscale: specify register type.
  rv34: use get_bits_left()
  avconv: reinitialize the filtergraph on resolution change.
  vsrc_buffer: error on changing frame parameters.
  avconv: fix -copyinkf.
  fate: Update file checksums after the mov muxer change in a78dbada55
  movenc: Don't store a nonzero creation time if nothing was set by the caller
  bmpdec: support for rgb444 with bitfields compression
  rgb2rgb: allow conversion for <15 bpp
  doc: fix stray reference to FFmpeg
  v4l2: use C99 struct initializer
  v4l2: poll the file descriptor
  ...

Conflicts:
	avconv.c
	libavcodec/aacsbr.c
	libavcodec/bethsoftvideo.c
	libavcodec/kmvc.c
	libavdevice/v4l2.c
	libavfilter/vsrc_buffer.c
	libswscale/swscale_unscaled.c
	libswscale/x86/input.asm
	tests/ref/acodec/alac
	tests/ref/acodec/pcm_s16be
	tests/ref/acodec/pcm_s24be
	tests/ref/acodec/pcm_s32be
	tests/ref/acodec/pcm_s8
	tests/ref/lavf/mov
	tests/ref/vsynth1/dnxhd_1080i
	tests/ref/vsynth1/mpeg4
	tests/ref/vsynth1/qtrle
	tests/ref/vsynth1/svq1
	tests/ref/vsynth2/dnxhd_1080i
	tests/ref/vsynth2/mpeg4
	tests/ref/vsynth2/qtrle
	tests/ref/vsynth2/svq1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-11 02:44:43 +01:00
..
alldevices.c
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
avdevice.c libavdevice: increase LIBAVDEVICE_VERSION_MICRO to 100 2011-12-22 03:06:33 +01:00
avdevice.h libavdevice: increase LIBAVDEVICE_VERSION_MICRO to 100 2011-12-22 03:06:33 +01:00
bktr.c Merge remote-tracking branch 'qatar/master' 2012-01-08 03:34:22 +01:00
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dshow.c lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
dshow.h
dv1394.c
dv1394.h cleanup: for(int 2011-12-13 21:08:43 +01:00
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-12 01:25:37 +01:00
lavfi.c lavd/lavfi: fix compiler warning for uninitialized variables 2011-12-31 11:51:56 +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-08 00:23:37 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +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
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' 2012-01-08 03:34:22 +01:00
timefilter.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
v4l2.c Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
v4l.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