virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
dd8ffc1925
FFmpeg/libavdevice
History
Michael Niedermayer dd8ffc1925 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (47 commits)
  lavc: hide private symbols.
  lavc: deprecate img_get_alpha_info().
  lavc: use avpriv_ prefix for ff_toupper4.
  lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
  lavc: use avpriv_ prefix for ff_ac3_parse_header.
  lavc: use avpriv_ prefix for ff_frame_rate_tab.
  lavc: rename ff_find_start_code to avpriv_mpv_find_start_code
  lavc: use avpriv_ prefix for ff_split_xiph_headers.
  lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header.
  lavc: use avpriv_ prefix for some dv symbols used in lavf.
  lavc: use avpriv_ prefix for some flac symbols used in lavf.
  lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
  lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
  lavc: use avpriv_ prefix for ff_aac_parse_header().
  lavf: hide private symbols.
  lavf: use avpriv_ prefix for some dv functions.
  lavf: use avpriv_ prefix for ff_new_chapter().
  avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation
  avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2()
  avcodec: clarify documentation of CODEC_CAP_DELAY
  ...

Conflicts:
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/dv.c
	libavcodec/dvdata.c
	libavcodec/dvdata.h
	libavcodec/libspeexenc.c
	libavcodec/mpegvideo.c
	libavcodec/version.h
	libavformat/avidec.c
	libavformat/dv.c
	libavformat/dv.h
	libavformat/flvenc.c
	libavformat/mov.c
	libavformat/mp3enc.c
	libavformat/oggparsespeex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-21 02:01:26 +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-20 02:34:51 +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 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
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-20 02:34:51 +02: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 AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*. 2011-10-17 07:33:10 +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-21 02:01:26 +02:00
dv1394.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fbdev.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
jack_audio.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
lavfi.c AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*. 2011-10-17 07:33:10 +02: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' 2011-10-21 02:01:26 +02:00
libdc1394.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
openal-dec.c AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*. 2011-10-17 07:33:10 +02:00
oss_audio.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
sdl.c AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*. 2011-10-17 07:33:10 +02: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' 2011-10-20 02:34:51 +02:00
sndio_enc.c oss,sndio: simplify by using FFMIN. 2011-06-09 22:53:17 +02:00
v4l2.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
v4l.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
vfwcap.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
x11grab.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00