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

53438 Commits

Author SHA1 Message Date
Giorgio Vazzana 7e03886bbb avutil/md5: reindent after previous commits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 16:11:08 +02:00
Michael Niedermayer 64eacb839e av_d2q: fix rounding for negative values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 16:04:08 +02:00
Michael Niedermayer de7d290631 av_d2q: Fix infinity check 
The old check would fail on huge but not infinite values
and the later code could then fail to handle them correctly in
some cases.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 16:03:50 +02:00
Paul B Mahol 8caf2da320 lavfi/afade: add timeline support 
For correct precision one may need to use asetnsamples.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-25 13:20:27 +00:00
Michael Niedermayer 760a9754ca img2dec: support seeking with ts_from_file 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 12:06:14 +02:00
Michael Niedermayer a753776ff5 img2dec: dont set start_time/duration to invalid values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 12:05:32 +02:00
Andrey Utkin 70fbfd75c3 img2dec: Add ts_from_file option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 11:42:28 +02:00
Paul B Mahol 2c2e69b3a2 lavfi/blend: support slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-24 21:41:28 +00:00
Michael Niedermayer e0f2e0fcf0 vf_fade: remove unused function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 20:50:15 +02:00
Michael Niedermayer 42bb3e4db6 avcodec: remove ff_get_logical_cpus() 
This simplifies the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 20:25:53 +02:00
Michael Niedermayer 0cbfbdef4a vf_fade: Support slice threaded alpha 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 20:21:40 +02:00
Michael Niedermayer a3d62f3377 vf_fade: Fix alpha flag integration 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 20:21:40 +02:00
Paul B Mahol af12573938 lavfi/blend: fix SW/SH calculation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-24 17:34:22 +00:00
Michael Niedermayer bca59d7745 fade: fix slice sizes 
This more evenly distributes the load between threads

This also fixes the chroma filtering where the filter was applied twice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 17:47:02 +02:00
Michael Niedermayer 1d08e4b584 yadif: fix slice sizes 
This more evenly distributes the load between threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 17:46:57 +02:00
Michael Niedermayer 221f902f1d avfilter/vf_yadif: fix race condition 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 17:26:20 +02:00
Michael Niedermayer fe99b1d50e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cpu: Include common.h for av_popcount64

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 17:19:21 +02:00
Reimar Döffinger 4059c7836a framemd5_class and md5enc_class may not be identical. 
Due the crappy issue of classes having to be unique,
we cannot even have classes with identical content,
otherwise the compiler or linker is free to merge them,
giving the same result and bugs as if we had only one class.
Besides redesigning the option code to handle this correctly
I see only the option of requiring any two classes to have
different names, but the list of requirements for
AVClasses is getting kind of unmanageable.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-05-24 16:28:25 +02:00
Carl Eugen Hoyos 82d105543c Fix compilation with --disable-everything --enable-filter=dctdnoiz 2013-05-24 14:19:20 +00:00
Thilo Borgmann 4a2c2a09a2 Fix compilation with --disable-everything --enable-muxer=vc1 
Suggested-by: Reimar
 2013-05-24 14:19:19 +00:00
Paul B Mahol 036e9a0417 lavfi/blend: add yuv(j)411p 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-24 14:02:37 +00:00
Michael Niedermayer 6d02bdc338 vformat/wtvenc: fix doxygen comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:36:54 +02:00
Michael Niedermayer 68ff528969 avformat/wtvdec: fix doxygen comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:36:54 +02:00
Michael Niedermayer 682f0035fb avformat/jvdec: fix doxygen comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:36:54 +02:00
Michael Niedermayer 8870cf7c0e avformat/gif: remove unneeded doxygen comment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:36:54 +02:00
Michael Niedermayer b5be1a7e23 avfilter/vf_drawtext: Fix doxygen comment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:36:54 +02:00
Michael Niedermayer 87a2bf2459 avutil/bprint: Fix doxygen comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:36:54 +02:00
Clément Bœsch 9c50e52005 cmdutils: print slice threading flag in -filters. 2013-05-24 15:34:37 +02:00
Michael Niedermayer a2abd58a09 avfilter: remove av_opt_set_defaults() from process_options() 
This is already called from ff_filter_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:25:52 +02:00
Michael Niedermayer 558ce3e5b7 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vf_fade: support slice threading
  vf_yadif: support slice threading

Conflicts:
	libavfilter/vf_fade.c
	libavfilter/vf_yadif.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:24:22 +02:00
Paul B Mahol 2516b393d4 lavfi/field, il, noise: use av_pix_fmt_count_planes() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-24 12:53:23 +00:00
Michael Niedermayer 8d4e969afe Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f' 
* commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f':
  lavfi: add a slice threading infrastructure

Conflicts:
	Changelog
	cmdutils.c
	doc/APIchanges
	libavfilter/Makefile
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/internal.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 14:07:00 +02:00
Michael Niedermayer fe40a9f98f Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675' 
* commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675':
  Move get_logical_cpus() from lavc/pthread to lavu/cpu.

Conflicts:
	doc/APIchanges
	libavcodec/pthread.c
	libavutil/cpu.c
	libavutil/cpu.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 13:24:28 +02:00
Michael Niedermayer a4d3757b29 Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 
* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d':
  w32pthreads: move from lavc to compat/

Conflicts:
	libavcodec/Makefile
	libavcodec/pthread.c
	libavcodec/vp8.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 13:01:41 +02:00
Martin Storsjö 597208fde1 cpu: Include common.h for av_popcount64 
This fixes build failures on windows since 2a6eaeaa8.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-24 13:34:19 +03:00
Michael Niedermayer ecbd96ed23 Merge commit 'e69222c50755030eef921e899e38b71a111093d9' 
* commit 'e69222c50755030eef921e899e38b71a111093d9':
  doxy: enable TYPEDEF_HIDES_STRUCT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 12:25:21 +02:00
Michael Niedermayer 029353e427 Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68' 
* commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68':
  Monkey's Audio old versions FATE tests
  h264_parser: Set field_order and picture_structure.

Conflicts:
	libavcodec/h264_parser.c
	tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 12:15:56 +02:00
Clément Bœsch cf6ed1f129 lavu/opencl: remove semi-colon from macro. 
Fixes compilation when the macros are empty and the label above ends up
containing no statement. Also makes usage of these macro consistent
(some already have a semi colon, some others don't).

Fixes Ticket #2603
 2013-05-24 12:01:02 +02:00
Michael Niedermayer 0c25c398da Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1' 
* commit 'b493847df4ff8ce46f258749e4a3f304696b34c1':
  avcodec: Add picture structure information to AVCodecParserContext.

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 11:51:58 +02:00
Anton Khirnov 8a994b7406 vf_fade: support slice threading 2013-05-24 09:33:05 +02:00
Anton Khirnov cb79881b49 vf_yadif: support slice threading 2013-05-24 09:32:07 +02:00
Anton Khirnov 129bb23843 lavfi: add a slice threading infrastructure 
Mostly based on libavcodec's
 2013-05-24 09:28:18 +02:00
Anton Khirnov 2a6eaeaa85 Move get_logical_cpus() from lavc/pthread to lavu/cpu. 
It will be useful in lavfi, and could conceivably be useful to the user
applications as well.
 2013-05-24 09:28:00 +02:00
Anton Khirnov 90f9a5830b w32pthreads: move from lavc to compat/ 
It will be used in other places than lavc.
 2013-05-24 09:26:54 +02:00
Anton Khirnov e69222c507 doxy: enable TYPEDEF_HIDES_STRUCT 
This means that typedef struct SomeStruct {...} SomeStruct will only be
documented as SomeStruct in the doxy, without a pointless entry in the
typedefs list.
 2013-05-24 09:12:00 +02:00
Kostya Shishkov e9e5a1bdc7 Monkey's Audio old versions FATE tests 2013-05-24 09:04:18 +02:00
Yusuke Nakamura 3f1a7ceb2c h264_parser: Set field_order and picture_structure. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-05-24 08:45:05 +02:00
Yusuke Nakamura b493847df4 avcodec: Add picture structure information to AVCodecParserContext. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-05-24 08:43:14 +02:00
Michael Niedermayer ac0ade2645 Changelog: add entry for the S302m encoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 04:42:32 +02:00
Paul B Mahol 102848e3b6 s302menc: unbreak compilation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 20:38:53 +00:00