RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
47,614 Commits 36 Branches 392 Tags 307 MiB
Commit Graph

108 Commits

Author SHA1 Message Date
Mans Rullgard 1073823984 dnxhdenc: whitespace cosmetics 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 02:12:47 +01:00
Michael Niedermayer bb258fb995 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: Improve references to external URLs.
  h264: move decode_mb_skip() from h264.h to h.264_mvpred.h
  ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2
  dnxhdenc: Replace a forward declaration by the proper #include.
  h264: move h264_mvpred.h include.
  pix_fmt: Fix number of bits per component in yuv444p9be
  lavf: deprecate AVFormatContext.timestamp
  ffmpeg: merge input_files_ts_scale into InputStream.
  ffmpeg: don't abuse a global for passing sample format from input to output
  ffmpeg: don't abuse a global for passing channel layout from input to output
  ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream()
  matroskaenc: make SSA default subtitle codec.
  oggdec: prevent heap corruption.

Conflicts:
	doc/developer.texi
	doc/faq.texi
	doc/general.texi
	ffmpeg.c
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-13 00:42:11 +02:00
Diego Biurrun 828e207337 dnxhdenc: Replace a forward declaration by the proper #include. 2011-07-12 19:24:53 +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
Anton Khirnov b66752790a AVOptions: make default_val a union, as proposed in AVOption2. 
This breaks API and ABI.
 2011-05-10 20:22:06 +02:00
Stefano Sabatini ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Stefano Sabatini 975a1447f7 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-02 12:18:44 +02:00
Michael Niedermayer ffb5a0d533 Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 
* commit '85770f2a2651497861ed938efcd0df3696ff5e45':
  AVOptions: make default_val a union, as proposed in AVOption2.
  Move ff_dynarray_add to lavu and make it public.
  lavf: remove duplicate assignment in avformat_alloc_context.
  lavf: use designated initializers for AVClasses.
  options: simplify av_find_opt by using av_next_option.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-01 00:26:05 +02:00
Anton Khirnov 85770f2a26 AVOptions: make default_val a union, as proposed in AVOption2. 
This breaks API and ABI.
 2011-04-30 08:34:16 +02:00
Michael Niedermayer 8772156be0 Merge remote branch 'qatar/master' 
* qatar/master:
  APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
  Introduce slice threads flag.
  FATE: allow forcing thread-type when doing threaded fate runs.
  Use av_log_ask_for_sample() where appropriate.
  error: sort, pack, and align error code and string definitions
  The stabilization period after version bumps should be one month, not one week.
  applehttp: Expose the stream bitrate via metadata
  doc: Add some initial docs on the applehttp demuxer
  Provide a fallback version of the libm function trunc
  libavdevice: Define _XOPEN_SOURCE for usleep
  lavc: provide deprecated avcodec_thread_init until next major version
  lavc: provide the opt.h header until the next bump
  error: change AVERROR_EOF value
  error: remove AVERROR_NUMEXPECTED
  error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

Conflicts:
	libavcodec/h264.c
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-22 03:54:30 +02:00
Ronald S. Bultje 94f7451a3a Introduce slice threads flag. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-04-21 19:42:19 -04: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
Luca Barbato 9ef5a9deaf Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
 2011-01-30 03:41:48 +01:00
Luca Barbato dfd2a005eb Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
 2011-01-29 23:55:37 +01:00
Diego Elio Pettenò e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Baptiste Coudurier 9d9c3e1a70 Make DNxHD encoder produce files that are strictly VC-3 compatible 
Originally committed as revision 25756 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-16 01:00:55 +00:00
Stefano Sabatini 72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Måns Rullgård 40d1122752 Use LOCAL_ALIGNED macro for local arrays 
Originally committed as revision 21866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 20:36:20 +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
Baptiste Coudurier cb893cf386 avoid integer overflow in dnxhd encoder, fixes #1557 
Originally committed as revision 20557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-20 00:13:34 +00:00
Baptiste Coudurier a4fcd9966b clarify why the encoder is failing 
Originally committed as revision 20556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-19 23:28:21 +00:00
Reimar Döffinger b5ca9cd36f Reindent after removing the outer for loops in the execute2 patch 
Originally committed as revision 20212 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 14:46:53 +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
Reimar Döffinger 01418506a2 Remove casts that are useless since the argument is void *. 
Originally committed as revision 20177 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-06 06:33:18 +00:00
Reimar Döffinger 40e26453c4 Use a custom radix sort implementation instead of qsort in dnxhd encoder. 
This is mainly to avoid test failures due to implementation-defined
behaviour of qsort when elements are equal, giving different results
for each of FreeBSD, Linux/glibc and Solaris.
In addition it is about 35 % faster, effect on overall speed is minimal
though (< 2%).
Regression tests are unchanged (i.e. identical to Linux/glibc).

Originally committed as revision 19949 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-21 10:28:31 +00:00
Baptiste Coudurier 301a24de52 fix uninitialized memory in dnxhd encoder 
Originally committed as revision 19912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-18 19:03:05 +00:00
Reimar Döffinger 2ba8301769 Mark all pix_fmts and supported_framerates compound literals as const. 
Makes no difference for gcc but at least icc can put them in .rodata then.

Originally committed as revision 19789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-06 16:09:21 +00:00
Ramiro Polla d31dbec374 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label 
parameters.

Originally committed as revision 19776 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-06 00:08:19 +00:00
Daniel Verkamp 10ce919561 data parameter of dnxhd_encode_picture() should not be const. 
Fixes "dnxhdenc.c:805: warning: initialization from incompatible pointer type".
patch by Daniel Verkamp, daniel drv nu

Originally committed as revision 18773 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-08 19:41:21 +00:00
Aurelien Jacobs b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +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 e1b24cfddb Move get_pixels_8x4 before init func to avoid useless forward declaration. 
Originally committed as revision 16071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 00:12:59 +00:00
Baptiste Coudurier 8c9c0ea427 rename 4x8 to 8x4 to match widthxheight consistently 
Originally committed as revision 16070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 00:11:19 +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
Baptiste Coudurier 00d9d0f5e2 cosmetics 
Originally committed as revision 16050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 01:16:01 +00:00
Baptiste Coudurier 049a6c8b32 use dsp clear_block 
Originally committed as revision 16049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 01:15:00 +00:00
Roman Shaposhnik 3a84713aaa Making it easier to send arbitrary structures as work orders to MT workers 
Originally committed as revision 15804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-12 17:47:23 +00:00
Stefano Sabatini fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL. 
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 21:50:13 +00:00
Baptiste Coudurier b73e868b4e cosmetics, remove table_ prefix 
Originally committed as revision 13617 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-02 03:12:43 +00:00
Baptiste Coudurier 556eec43ef optimize, merge offset bits in vlc code 
Originally committed as revision 13614 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-02 03:07:32 +00:00
Diego Biurrun f4433de9ef consistency cosmetics: indices --> indexes 
Originally committed as revision 13444 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 23:14:25 +00:00
Carl Eugen Hoyos 88a50f6c92 Replace one more occurrence of -1 with PIX_FMT_NONE. 
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13136 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-12 10:31:52 +00:00
Baptiste Coudurier 6650c4c3a8 export dnxhd encoded picture quality 
Originally committed as revision 13071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-06 17:18:41 +00:00
Stefano Sabatini d5202e4fda Add long names to many AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-27 10:52:44 +00:00
Michael Niedermayer 7993df6527 consts 
I have underestimated this a little, and these are just some ...

Originally committed as revision 11708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 03:26:31 +00:00
Baptiste Coudurier 0c39c38b14 add bitrate helper to choose all dnxhd variants 
Originally committed as revision 11260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-18 13:52:07 +00:00
Baptiste Coudurier c20d3ce255 indentation 
Originally committed as revision 11134 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-02 19:28:20 +00:00
Baptiste Coudurier cc3a970857 dnxhd 720p encoding and decoding support 
Originally committed as revision 11133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-02 19:27:19 +00:00
Baptiste Coudurier df745b9ce6 cosmetics, encode_variance -> encode_fast 
Originally committed as revision 11132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-02 19:22:38 +00:00
Baptiste Coudurier 78532b052d fix corner case when qscale 1 bits < frame bits but max bits with worst padding > frame bits 
Originally committed as revision 11131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-02 19:20:46 +00:00
Baptiste Coudurier 45b8e9e507 better lambda search method 
Originally committed as revision 10697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-09 14:15:03 +00:00
Baptiste Coudurier 2e85b344f7 dnxhd 36mbit support 
Originally committed as revision 10689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-08 15:36:57 +00:00
Baptiste Coudurier 6cb1d36169 typo weigth->weight 
Originally committed as revision 10687 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-08 12:28:36 +00:00
Baptiste Coudurier fc4cbc1699 DNxHD (SMPTE VC-3) encoder 
Originally committed as revision 10682 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-08 11:27:18 +00:00