RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-03 05:13:44 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
38,145 Commits 37 Branches 400 Tags 264 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
e99f1a8cc8
Go to file
Michael Niedermayer e99f1a8cc8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dxva2: don't check for DXVA_PictureParameters->wDecodedPictureIndex
  img2: split muxer and demuxer into separate files
  rm: prevent infinite loops for index parsing.
  aac: fix infinite loop on end-of-frame with sequence of 1-bits.
  mov: Add more HDV and XDCAM FourCCs.
  lavf: don't set AVCodecContext.has_b_frames in compute_pkt_fields().
  rmdec: when using INT4 deinterleaving, error out if sub_packet_h <= 1.
  cdxl: correctly synchronize video timestamps to audio
  mlpdec_parser: fix a few channel layouts.
  Add channel names to channel_names[] array for channels added in b2890f5
  movenc: Buffer the mdat for the initial moov fragment, too
  flvdec: Ignore the index if the ignidx flag is set
  flvdec: Fix indentation
  movdec: Don't parse all fragments if ignidx is set
  movdec: Restart parsing root-level atoms at the right spot
  prores: use natural integer type for the codebook index
  mov: Add support for MPEG2 HDV 720p24 (hdv4)
  swscale: K&R formatting cosmetics (part I)
  swscale: variable declaration and placement cosmetics

Conflicts:
	configure
	libavcodec/aacdec.c
	libavcodec/mlp_parser.c
	libavformat/flvdec.c
	libavformat/img2.c
	libavformat/isom.h
	libavformat/mov.c
	libavformat/movenc.c
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb_template.c
	libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-23 04:31:55 +01:00
doc eval: Add taylor series evaluation support. 2012-02-22 23:09:47 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
libavdevice lavd/lavfi: support all sample formats. 2012-02-22 11:37:32 +01:00
libavfilter af_pan: remove dual double/int storage of gain. 2012-02-22 10:50:58 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
libpostproc
libswresample libswr: allow to set custom matrices. 2012-02-20 20:46:35 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
mt-work
presets
tests eval: Add taylor series evaluation support. 2012-02-22 23:09:47 +01:00
tools
.gitignore
Changelog Merge remote-tracking branch 'qatar/master' 2012-02-18 02:20:19 +01:00
cmdutils_common_opts.h cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
cmdutils.c cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
cmdutils.h cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
common.mak
configure dxva2: don't check for DXVA_PictureParameters->wDecodedPictureIndex 2012-02-22 22:04:03 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Add missing av_free_packet. 2012-02-20 21:23:00 +01:00
ffplay.c
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
INSTALL
library.mak
LICENSE Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
MAINTAINERS
Makefile
README
RELEASE
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.