generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
53,508 Commits 24 Branches 241 Tags 173 MiB
3300b5f6ce
Commit Graph

53508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Paul B Mahol
e75ddb7df5 s302menc: fix bits_per_raw_sample for 21, 22 & 23 case 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 20:36:17 +00:00
Paul B Mahol
d683271753 lavc/codec_desc: SMPTE 302M is not lossy 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 20:26:19 +00:00
Paul B Mahol
15b9c0b49f escape124: switch to init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 19:58:03 +00:00
Paul B Mahol
cdc3f8f307 escape124: pass context to av_log() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 19:53:08 +00:00
Paul B Mahol
abf1e59ef2 libaacplus: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 19:41:43 +00:00
Paul B Mahol
6d53034483 libaacplus: cosmetics: fix indentation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 19:41:43 +00:00
Paul B Mahol
963c58006f libaacplus: move profile check above, simplifies code a little 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 19:41:38 +00:00
Michael Niedermayer
0fb7fef879 tools/patcheck: fix misdetection with stuff like const_names 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 19:11:28 +02:00
Clément Bœsch
d51dfc7ec4 doc/filters: fix wording of color option in testsrc filters. 2013-05-23 17:22:05 +02:00
Clément Bœsch
a0a41db339 lavfi/testsrc: make nb_decimals available only in testsrc. 2013-05-23 17:22:05 +02:00
Clément Bœsch
288f916643 lavfi/testsrc: move color options to the color scope filter definition. 2013-05-23 17:22:05 +02:00
Michael Niedermayer
eee19198ef avcodec/libfaac: fallback to a supported bitrate if the requested is not supported 
Fixes: Ticket2587

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 15:37:48 +02:00
Michael Niedermayer
e8c26557a4 avformat/mtv: remove empty comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 14:46:01 +02:00
Michael Niedermayer
ef43b9496b avcodec/mpegvideo: remove empty comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 14:43:42 +02:00
Michael Niedermayer
1d3476f258 postproc/postprocess_template: remove empty comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 14:39:58 +02:00
Darryl Wallace
3e16047507 s302m encoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 12:03:06 +00:00
Paul B Mahol
fbd0f91a3a escape130: switch to init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 10:21:12 +00:00
Michael Niedermayer
ac2c52174f avcodec/wavpack: remove ;; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 12:07:31 +02:00
Paul B Mahol
79f452f4e6 fraps: set avctx->color_range 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 10:05:28 +00:00
Paul B Mahol
591fa05278 doc/general: remove obsolete info about APE decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 09:32:12 +00:00
Michael Niedermayer
b7d16dc4bd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wavpack: check packet size early

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 10:55:46 +02:00
Michael Niedermayer
402bec52d4 Merge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62' 
* commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62':
  wavpack: use bytestream2 in wavpack_decode_block

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 10:46:05 +02:00
Michael Niedermayer
1fded9b69c Merge commit 'f36d7831d96aeb072db5a2b78892a534d96e288e' 
* commit 'f36d7831d96aeb072db5a2b78892a534d96e288e':
  pixdesc: mark gray8 as pseudopal

Conflicts:
	libavutil/pixdesc.c

No change as gray8 was already marked as pseudopal in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 10:33:45 +02:00
Michael Niedermayer
1724123c65 Merge commit '3eae9b030cbbdc263f69834b791624613032d548' 
* commit '3eae9b030cbbdc263f69834b791624613032d548':
  mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 10:25:25 +02:00
Dale Curtis
c54a1565f5 avformat/utils: Keep internal and external av_read_frame() packets in sync. 
Otherwise, during error conditions, the caller will be left with
dangling pointers to a destructed packet => boom.

BUG=242786
TEST=ffmpeg_regression_tests

Commit slightly simplified by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-23 03:29:47 +02:00
Paul B Mahol
1f02927d28 lavfi/mp: try to pass interlaced & tff flags 
This makes mp=softpulldown actually useful.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-22 20:30:09 +00:00
Clément Bœsch
91b461459a lavfi/lut3d: avoid overread. 2013-05-22 22:12:14 +02:00
Luca Barbato
fd06291239 wavpack: check packet size early 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-05-22 22:02:57 +02:00
Luca Barbato
3f0b6d7a62 wavpack: use bytestream2 in wavpack_decode_block 
Prevent most out of buffer reads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-05-22 22:02:55 +02:00
Michael Niedermayer
657875b145 avcodec/aic: Fix vlc value checks 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 21:30:28 +02:00