wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
No description
33879 commits 40 branches 405 tags 230 MiB
Find a file
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
doc libspeexenc: add libspeex encoder 2011-10-20 13:06:15 -04:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
libavfilter lavfi: add missing header mulitple-inclusion guard in transform.h 2011-10-20 15:59:20 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libpostproc
libswresample swr: Fix swresample.c:293:5: warning: passing argument 2 of ‘fill_audiodata’ from incompatible pointer type 2011-10-21 00:36:00 +02:00
libswscale swscale: prevent overflow during initialization 2011-10-18 10:29:49 +02:00
mt-work
presets presets: spelling error in libvpx 1080p50_60 2011-10-21 00:20:33 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
tools
.gitignore
avconv.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
cmdutils.c
cmdutils.h cmdutils.h: Project name cleanup 2011-10-14 02:18:55 +02:00
cmdutils_common_opts.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile doxygen: dont generate docs for avconv.c 2011-09-08 17:56:17 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
ffplay.c ffplay: avoid window resize crash on osx with libsdl 1.2.14 2011-10-16 19:28:22 +02:00
ffprobe.c ffprobe: prefer av_freep() over av_free() for global print_format option. 2011-10-18 19:11:05 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
INSTALL
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
README
RELEASE
subdir.mak
version.sh

README 

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.