FFmpeg git repo
Go to file
Michael Niedermayer 77aafadc56 Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'
* commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8':
  h264: Move start code search functions into separate source files.

Conflicts:
	libavcodec/arm/Makefile
	libavcodec/arm/h264dsp_init_arm.c
	libavcodec/h264_parser.c
	libavcodec/h264dsp.c
	libavcodec/startcode.c
	libavcodec/startcode.h

See: 270cede3f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 12:46:10 +02:00
compat
doc Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6' 2014-08-04 22:12:24 +02:00
libavcodec Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8' 2014-08-05 12:46:10 +02:00
libavdevice lavd/avfoundation: Add device category. 2014-08-05 01:36:26 +02:00
libavfilter Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a' 2014-08-04 06:11:34 +02:00
libavformat avformat/util: change av_find_default_stream_index() to use a score based system 2014-08-04 18:06:26 +02:00
libavresample
libavutil Fix compile error on bfin. 2014-08-05 01:54:47 +02:00
libpostproc
libswresample
libswscale swscale/swscale_internal: fix ya16 -> rgba 2014-08-05 01:51:11 +02:00
presets
tests Merge commit 'eee813eec7d3c0b0689f80665d3f796401742935' 2014-08-05 01:20:20 +02:00
tools
.gitignore
arch.mak
Changelog libavformat: Add Icecast protocol 2014-08-04 13:33:44 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8' 2014-08-05 12:46:10 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffmpeg.h ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS
Makefile
README.md
RELEASE
RELEASE_NOTES
version.sh

FFmpeg README

  1. Documentation

  1. Licensing

  • See the LICENSE file.
  1. Build and Install

  • See the INSTALL file.