virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
63,805 Commits 37 Branches 400 Tags 467 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
5163fb9446
Go to file
Michael Niedermayer 5163fb9446 Merge commit '8a06794112d02a5707f766b8b38a5d50dfd03898' 
* commit '8a06794112d02a5707f766b8b38a5d50dfd03898':
  mpeg2: add sequence display extension information

Conflicts:
	libavcodec/mpeg12enc.c
	tests/ref/lavf/gxf
	tests/ref/lavf/mxf
	tests/ref/lavf/mxf_d10
	tests/ref/lavf/ts
	tests/ref/seek/lavf-gxf
	tests/ref/seek/lavf-mxf
	tests/ref/seek/lavf-ts
	tests/ref/seek/vsynth2-mpeg2-422
	tests/ref/seek/vsynth2-mpeg2-idct-int
	tests/ref/seek/vsynth2-mpeg2-ilace
	tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
	tests/ref/seek/vsynth2-mpeg2-thread
	tests/ref/seek/vsynth2-mpeg2-thread-ivlc
	tests/ref/vsynth/vsynth1-mpeg2
	tests/ref/vsynth/vsynth1-mpeg2-422
	tests/ref/vsynth/vsynth1-mpeg2-idct-int
	tests/ref/vsynth/vsynth1-mpeg2-ilace
	tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd
	tests/ref/vsynth/vsynth1-mpeg2-thread
	tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc
	tests/ref/vsynth/vsynth2-mpeg2
	tests/ref/vsynth/vsynth2-mpeg2-422
	tests/ref/vsynth/vsynth2-mpeg2-idct-int
	tests/ref/vsynth/vsynth2-mpeg2-ilace
	tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
	tests/ref/vsynth/vsynth2-mpeg2-thread
	tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 22:36:07 +02:00
compat
doc avfilter: new multimedia filter avf_showcqt.c 2014-06-05 14:04:01 +02:00
libavcodec Merge commit '8a06794112d02a5707f766b8b38a5d50dfd03898' 2014-06-06 22:36:07 +02:00
libavdevice fix various typos 2014-06-03 10:58:19 -08:00
libavfilter avfilter/avf_showcqt: avoid using fminf() 2014-06-06 17:20:05 +02:00
libavformat lavf/matroskaenc: Fix Cues on Audio for WebM DASH 2014-06-06 21:36:11 +02:00
libavresample Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342' 2014-05-29 01:23:22 +02:00
libavutil avutil/libm: fix fminf() emulation build failure due to undefined FFMIN 2014-06-06 21:00:11 +02:00
libpostproc
libswresample fix various typos 2014-06-03 10:58:19 -08:00
libswscale Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73' 2014-06-02 19:38:01 +02:00
presets
tests Merge commit '8a06794112d02a5707f766b8b38a5d50dfd03898' 2014-06-06 22:36:07 +02:00
tools fix various typos 2014-06-03 10:58:19 -08:00
.gitignore
arch.mak
Changelog avfilter: new multimedia filter avf_showcqt.c 2014-06-05 14:04:01 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure build: add fminf() emulation 2014-06-06 14:54:57 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding context 2014-06-01 17:16:08 +02:00
ffmpeg_opt.c ffmpeg_opt: fix ffserver with the 2 encoder contexts 2014-06-01 17:29:59 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: prevent pts < dts to be passed through to the muxer on stream copy 2014-06-05 18:37:32 +02:00
ffmpeg.h ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding context 2014-06-01 17:16:08 +02:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS avfilter: new multimedia filter avf_showcqt.c 2014-06-05 14:04:01 +02:00
Makefile
README.md
RELEASE
version.sh

README.md

FFmpeg README

  1. Documentation
  1. Licensing
  • See the LICENSE file.
  1. Build and Install
  • See the INSTALL file.