generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
e37f161e66
ffmpeg/libavdevice
History
Michael Niedermayer e37f161e66 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (71 commits)
  movenc: Allow writing to a non-seekable output if using empty moov
  movenc: Support adding isml (smooth streaming live) metadata
  libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
  sunrast: Document the different Sun Raster file format types.
  sunrast: Add a check for experimental type.
  libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
  lavf: remove disabled FF_API_SET_PTS_INFO cruft
  lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
  lavf: remove disabled FF_API_REORDER_PRIVATE cruft
  lavf: remove disabled FF_API_SEEK_PUBLIC cruft
  lavf: remove disabled FF_API_STREAM_COPY cruft
  lavf: remove disabled FF_API_PRELOAD cruft
  lavf: remove disabled FF_API_NEW_STREAM cruft
  lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
  lavf: remove disabled FF_API_MUXRATE cruft
  lavf: remove disabled FF_API_FILESIZE cruft
  lavf: remove disabled FF_API_TIMESTAMP cruft
  lavf: remove disabled FF_API_LOOP_OUTPUT cruft
  lavf: remove disabled FF_API_LOOP_INPUT cruft
  lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
  ...

Conflicts:
	doc/APIchanges
	libavcodec/8bps.c
	libavcodec/avcodec.h
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/options.c
	libavcodec/sunrast.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/h264_deblock.asm
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/avformat.h
	libavformat/avio.c
	libavformat/avio.h
	libavformat/aviobuf.c
	libavformat/dv.c
	libavformat/mov.c
	libavformat/utils.c
	libavformat/version.h
	libavformat/wtv.c
	libavutil/Makefile
	libavutil/file.c
	libswscale/x86/input.asm
	libswscale/x86/swscale_mmx.c
	libswscale/x86/swscale_template.c
	tests/ref/lavf/ffm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28 07:53:34 +01:00
..
alldevices.c Merge remote-tracking branch 'qatar/master' 2012-01-24 22:53:59 +01: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' 2012-01-28 07:53:34 +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 libavdevice: increase LIBAVDEVICE_VERSION_MICRO to 100 2011-12-22 03:06:33 +01:00
avdevice.h Merge remote-tracking branch 'qatar/master' 2012-01-24 22:53:59 +01:00
bktr.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dshow_common.c dshow: add audio/video options 2011-09-16 11:06:56 +02:00
dshow_enummediatypes.c DirectShow capture support 2011-05-21 17:23:14 +02:00
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 Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dshow.h dshow: add audio/video options 2011-09-16 11:06:56 +02:00
dv1394.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dv1394.h cleanup: for(int 2011-12-13 21:08:43 +01:00
fbdev.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
jack_audio.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
lavfi.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
libavdevice.v Add symbol versioning for shared libraries 2010-01-16 04:49:02 +00:00
libcdio.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
libdc1394.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
Makefile buildsystem: 10l add v4l entry back 2012-01-25 00:46:41 +01:00
openal-dec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
oss_audio.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
pulse.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
sdl.c Make sdl_overlay_pix_fmt_map static const. 2011-11-05 15:37:02 +01:00
sndio_common.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
sndio_common.h lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
sndio_dec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
sndio_enc.c oss,sndio: simplify by using FFMIN. 2011-06-09 22:53:17 +02:00
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-28 07:53:34 +01:00
v4l.c v4l: fix compilation 2012-01-25 00:13:35 +01:00
vfwcap.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
x11grab.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00