starred/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-24 07:31:22 +01:00
Code Issues 5 Projects Packages Wiki Activity Actions
No description
37331 commits 6 branches 0 tags 382 MiB
Find a file
Michael Niedermayer c065255bba Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  aacenc: Fix LONG_START windowing.
  aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
  avplay: use the correct array size for stride.
  lavc: extend doxy for avcodec_alloc_context3().
  APIchanges: mention avcodec_alloc_context()/2/3
  avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
  aacsbr: ARM NEON optimised sbrdsp functions
  aacsbr: align some arrays
  aacsbr: move some simdable loops to function pointers
  cosmetics: Remove extra newlines at EOF

Conflicts:
	libavcodec/utils.c
	libavfilter/formats.c
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-29 00:34:59 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
libpostproc build: Allow building old API/ABI libpostproc version 2012-01-24 17:01:10 +01:00
libswresample libswresample: introduce int swr_set_compensation() instead of void swr_compensate() 2012-01-09 04:16:06 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Remove unnecessary -vsync 0. 2012-01-28 22:01:09 +01:00
tools Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
Changelog Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
cmdutils.c cmdutils: re-add return 0 accidentally remove from opt_protocols(). 2012-01-28 12:39:57 +01:00
cmdutils.h Drop unnecessary prefix from *sink* variable and struct names. 2012-01-25 12:28:36 +01:00
cmdutils_common_opts.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c Add -vsync drop. 2012-01-28 22:01:09 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
ffprobe.c ffprobe: increase precision for the shown float values 2012-01-20 13:27:57 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-01-23 01:05:20 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS maintainers: add myself for recent works. 2012-01-24 16:07:53 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.