virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
35,402 Commits 37 Branches 400 Tags 463 MiB
52b7ed4f6e
Commit Graph

14 Commits

Author SHA1 Message Date
Michael Niedermayer
4095fa9038 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dnxhddec: optimise dnxhd_decode_dct_block()
  rtp: remove disabled code
  eac3enc: use different numbers of blocks per frame to allow higher bitrates
  dnxhd: add regression test for 10-bit
  dnxhd: 10-bit support
  dsputil: update per-arch init funcs for non-h264 high bit depth
  dsputil: template get_pixels() for different bit depths
  dsputil: create 16/32-bit dctcoef versions of some functions
  jfdctint: add 10-bit version
  mov: add clcp type track as Subtitle stream.
  mpeg4: add Mpeg4 Profiles names.
  mpeg4: decode Level Profile for MPEG4 Part 2.
  ffprobe: display bitstream level.
  imgconvert: remove unused glue and xglue macros

Conflicts:
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-22 12:08:52 +02:00
Joseph Artsimovich
5ab21439fd dnxhd: 10-bit support 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 18:44:40 +01:00
Michael Niedermayer
d552f616a2 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (28 commits)
  Remove some non-compiling debug messages.
  ffplay: Fix non-compiling debug printf and replace it by av_dlog.
  H264: x86 predict init cosmetics.
  ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
  Move E-AC-3 encoder functions to a separate eac3enc.c file.
  ac3enc: remove convenience macro, #define DEBUG
  ac3enc: remove unused #define
  vc1: re-initialize tables after width/height change.
  APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition
  samplefmt: add av_get_bytes_per_sample()
  iirfilter: fix biquad filter coefficients.
  swscale: remove duplicate conversion routine in swScale().
  swscale: add yuv2planar/packed function typedefs.
  swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers.
  swscale: reindent x86 init code.
  swscale: extract SWS_FULL_CHR_H_INT conditional into init code.
  swscale: cosmetics.
  swscale: remove alp/chr/lumSrcOffset.
  swscale: un-special-case yuv2yuvX16_c().
  shorten: Remove stray DEBUG #define and corresponding av_dlog statement.
  ...

Conflicts:
	doc/APIchanges
	libavcodec/ac3enc.c
	libavutil/avutil.h
	libavutil/samplefmt.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-08 05:25:28 +02:00
Diego Biurrun
dc25d79f49 Drop unnecessary directory prefixes from #include directives. 2011-06-07 10:31:26 +02:00
Baptiste Coudurier
14cf9e698d dnxhdenc: add AVClass in private context. 
Fixes private options.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-12 13:08:10 +02:00
Baptiste Coudurier
d9699ea825 Fix dnxhd custom options, add AVClass in private context 2011-03-30 08:48:08 -07:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Baptiste Coudurier
176e176288 dnxhd: allow encoding with Avid Nitris compatibility. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 99bbc781e9)
 2011-03-03 14:15:09 +01:00
Baptiste Coudurier
99bbc781e9 dnxhd: allow encoding with Avid Nitris compatibility. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-01 23:55:55 +00:00
Måns Rullgård
84dc2d8afa Remove DECLARE_ALIGNED_{8,16} macros 
These macros are redundant.  All uses are replaced with the generic
DECLARE_ALIGNED macro instead.

Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 14:24:59 +00:00
Måns Rullgård
c67278098d Move array specifiers outside DECLARE_ALIGNED() invocations 
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-22 03:25:11 +00:00
Reimar Döffinger
2a1294b978 Move dnxhdenc to execute2 multithreading API. 
This allows for some simplifications like removing some outer loops
and gives much better performance for thread_count > number of idle CPUs.

Originally committed as revision 20211 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 14:43:57 +00:00
Baptiste Coudurier
193ce3ab78 dnxhd get_pixels_8x4_sym sse2 
Originally committed as revision 16072 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 00:19:14 +00:00
Baptiste Coudurier
09f6fc6b74 move structure definitions in their own header 
Originally committed as revision 16051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 01:32:24 +00:00