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

53002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
d13bc208da Merge commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0' 
* commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0':
  oma: return meaningful errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 13:37:26 +02:00
Michael Niedermayer
fe6a36e768 Merge commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9' 
* commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9':
  lavc: do not leak frames in avcodec_decode_audio4

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 13:25:19 +02:00
Michael Niedermayer
9818bbde53 Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe' 
* commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe':
  nut: use meaningful error values
  FATE: use a less ambiguous end time for filter-trim-time test

Conflicts:
	libavformat/nutdec.c
	tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 12:47:54 +02:00
Michael Niedermayer
1aed0513a1 configure: use shorter variable name for "libavdevice_pc_deps" 
This is in line with the new name for the libavfilter variable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 12:38:01 +02:00
Michael Niedermayer
28397de4df Merge commit '9779f93066ee5ea6fba6b76f001d358cc2857891' 
* commit '9779f93066ee5ea6fba6b76f001d358cc2857891':
  configure: add dependencies to lavfi .pc file

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 12:37:15 +02:00
Michael Niedermayer
bf0547504b Merge commit 'bce70f8170592599a4f2f5f02606c1246e88df57' 
* commit 'bce70f8170592599a4f2f5f02606c1246e88df57':
  configure: make avconv select (a)trim filters

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 12:17:46 +02:00
Michael Niedermayer
42f5fc716e Merge commit '481575d255195c6c2f32e04686b94de984ae78d4' 
* commit '481575d255195c6c2f32e04686b94de984ae78d4':
  avconv: remove -deinterlace

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg.c
	ffmpeg_opt.c

The merge removes the documentation for the deprecated -deinterlace
the code itself has already been replaced a while ago by code
that inserts yadif, that insertion code is left in place.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 12:07:56 +02:00
Michael Niedermayer
e077ba8016 Merge commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8' 
* commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8':
  indeo3: use unaligned reads on reference blocks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 11:54:29 +02:00
Michael Niedermayer
1bad40ef27 Merge commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c' 
* commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c':
  jpeg2000dec: initialize static data just once

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 11:46:41 +02:00
Michael Niedermayer
aecb3421f6 Merge commit '45a1694fde251ee56e23aec073d73172c00aa470' 
* commit '45a1694fde251ee56e23aec073d73172c00aa470':
  jpeg2000dec: cleanup properly after decoding errors

Conflicts:
	libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 11:41:54 +02:00
Christophe Gisquet
fc37cd4333 x86: sbrdsp: force PIC addressing for Win64 
MSVC complains about the 32bits addressing, while mingw/gcc does not.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 03:07:03 +02:00
Stefano Sabatini
ae0ce99ca4 lavfi/unsharp: use verbal form in help message options 2013-05-08 01:39:12 +02:00
Stefano Sabatini
ee9794ed20 lavu/mem: fix potential int overflow and crash in av_dynarray_add() 
Also extend documentation accordingly.
 2013-05-08 01:39:12 +02:00
Stefano Sabatini
c773adee3f lavu/mem: extend documentation for av_dynarray_add() 
In particular, mention the fact that the amortized element addition cost
is constant.
 2013-05-08 01:39:12 +02:00
Michael Niedermayer
c67bca2b5a avcodec/mpegvideo: Fix edge emu with lowres 
Fixes a few green artifacts at the top
Fixes rest of Ticket 2535

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 01:18:56 +02:00
Michael Niedermayer
bca50e5cd5 avcodec/mpegvideo: Fix block height for lowres 3 interlaced blocks 
Fixes green trash
Fixes part of Ticket2535

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 01:17:45 +02:00
Diego Biurrun
ed880050ed x86: dsputil: Group all assembly constants together in constants.c 2013-05-08 01:04:04 +02:00
Diego Biurrun
8761466760 x86: dsputil: Move ff_pd assembly constants to the only place they are used 2013-05-08 01:04:04 +02:00
Martin Storsjö
06122c2533 msvc: Move linker pragma from config.h to libavutil/internal.h 
This makes linking succeed for tools that include config.h but
don't link to libavutil.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-08 01:28:25 +03:00
Michael Niedermayer
bc0cbaca62 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavfi: add comments to explain the negotiation loop.
  lavfi: fix filter format negotiation loop.
  ffmpeg: move a local variable definition later.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 23:52:39 +02:00
Michael Niedermayer
a527e69259 avformat/vqf: check number of channels before use. 
Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 22:26:56 +02:00
Michael Niedermayer
9dd04f6d8c sanm: Check dimensions before use 
Fixes integer overflow and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 21:59:05 +02:00
Michael Niedermayer
ad002e1a13 avcodec/cdgraphics: check buffer size before use 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 21:06:48 +02:00
Michael Niedermayer
ead590c256 dxa: check vectors of 2x2 motion blocks 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 20:33:46 +02:00
Michael Niedermayer
f96e0eb238 dxa: check vectors of 4x4 motion blocks 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 20:20:14 +02:00
Michael Niedermayer
89d998f1c1 shorten: allocate space for padding 
Fixes array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 20:05:53 +02:00
Diego Biurrun
bd392785a7 fate-run: Drop unnecessary regtest() indirection 
The indirection was used to abstract from the different -regression.sh
scripts. Now that only one remains, this indirection is pointless.
 2013-05-07 19:27:47 +02:00
Nicolas George
4582e4c086 lavfi: add comments to explain the negotiation loop. 2013-05-07 18:40:51 +02:00
Nicolas George
78d16b6a51 lavfi: fix filter format negotiation loop. 
query_formats() returning EAGAIN is not considered a progress
in the format negotiation.

If the filter returns EAGAIN but did set some of its formats
lists, it could be considered a partial success and counted
as progress in the negotiation. Not counting it is not a
problem because it currently only happens in the first round,
where there will always be some progress on the other filters.
 2013-05-07 18:40:51 +02:00
Nicolas George
449704b475 ffmpeg: move a local variable definition later. 
Fix a segfault when using the -map option without input files.
 2013-05-07 18:39:45 +02:00
Diego Biurrun
1b343cedd7 x86: dsputil: Remove unused ff_pb_3F constant 2013-05-07 18:03:35 +02:00
Diego Biurrun
63bac48f73 x86: dsputil: Move rv40-specific functions where they belong 2013-05-07 18:03:35 +02:00
Diego Biurrun
3334cbec0a x86: dsputil: Remove unused MOVQ_BONE macro 2013-05-07 18:03:35 +02:00
Diego Biurrun
92f8e06ecb x86: dsputil hpeldsp: Move shared template functions into separate object 2013-05-07 18:03:34 +02:00
Diego Biurrun
7edaf4edb5 x86: rnd_template: Eliminate pointless OP_AVG macro indirection 2013-05-07 18:03:34 +02:00
Michael Niedermayer
d23b8462b5 gifdec: reset previous Graphic Control Extension disposal type 
This fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 17:03:34 +02:00
Clément Bœsch
d3f7b98f87 lavfi/overlay: reindent fix. 2013-05-07 15:43:28 +02:00
Clément Bœsch
5043d8d213 lavfi/alphaextract: copy width and not linesize. 
Padding data is not supposed to be copied.
 2013-05-07 15:33:49 +02:00
Clément Bœsch
c3dcd3a255 sws: factorize rgb 9+ planar funcs declarations. 2013-05-07 15:23:27 +02:00
Luca Barbato
db9aee6ccf oma: properly forward errors in oma_read_packet 
Prevent spurios EIO on EOF.

CC:libav-stable@libav.org
 2013-05-07 14:37:32 +02:00
Luca Barbato
6f98508e2b oma: return meaningful errors 2013-05-07 14:37:32 +02:00
Luca Barbato
e55e8b2c36 lavc: do not leak frames in avcodec_decode_audio4 
Notwithstanding the return value the frame should be freed if
is not going to be used.

Reported-by: Matthew Wolenetz <wolenetz@chromium.org>
 2013-05-07 14:37:32 +02:00
Luca Barbato
e0c53c3408 nut: use meaningful error values 
Fix the mispresented EINVAL for EOF on partial files, among the other.
 2013-05-07 14:37:32 +02:00
Michael Niedermayer
144baf427a Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Support decoding of Lagarith frame type FRAME_SOLID_COLOR.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 14:21:49 +02:00
Gunther Piez
acc4a7e5b3 Ticket #2540 Enable threading when using -c:v libx264rgb 
Signed-off-by: Gunther Piez <gupiez@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 13:38:15 +02:00
Michael Niedermayer
2efbbc4644 avutil/av_pix_fmt_swap_endianness: simplify and fix code 
This makes the code also more robust, not having a hard-coded
table that can become (and was) incomplete.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 13:13:09 +02:00
Anton Khirnov
cd4bfe3a50 FATE: use a less ambiguous end time for filter-trim-time test 
0.1 seconds at 25 fps is exactly 2.5 frames, which may be rounded either
to 2 or 3 on different platforms.
 2013-05-07 12:33:13 +02:00
Anton Khirnov
9779f93066 configure: add dependencies to lavfi .pc file 
The scale filter depends on sws, resample on lavr, and movie on lavf and
lavc.

Fixes Bug 502.
 2013-05-07 12:32:14 +02:00
Anton Khirnov
bce70f8170 configure: make avconv select (a)trim filters 
They are now used for -ss/-t
 2013-05-07 12:32:03 +02:00
Anton Khirnov
481575d255 avconv: remove -deinterlace 
It is incompatible with refcounted frames and since it's been deprecated
for a long time now, fixing it is not worth the effort.
 2013-05-07 12:31:55 +02:00