Michael Niedermayer
37f080f6f6
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h261: Move mvmap table to the only place it is used
Conflicts:
libavcodec/h261data.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 22:09:10 +02:00
Michael Niedermayer
473d129742
Merge commit '0404ec619d43f27b87c424aa1a572a6699fe6a31'
...
* commit '0404ec619d43f27b87c424aa1a572a6699fe6a31':
h261: cosmetics: Move functions to avoid forward declarations
Conflicts:
libavcodec/h261dec.c
libavcodec/h261enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 22:00:38 +02:00
Michael Niedermayer
04b0fd7e91
Merge commit 'b78f81c8033904e2e75add0c9a603df6df514a30'
...
* commit 'b78f81c8033904e2e75add0c9a603df6df514a30':
h261: K&R formatting and prettyprinting cosmetics
Conflicts:
libavcodec/h261_parser.c
libavcodec/h261data.h
libavcodec/h261dec.c
libavcodec/h261enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 21:53:57 +02:00
Michael Niedermayer
e7c801d9d3
Merge commit '66ac3dbf1e60c27d0f1d779a424c0b33b7ca3780'
...
* commit '66ac3dbf1e60c27d0f1d779a424c0b33b7ca3780':
h261: Move function declarations to h261.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 21:31:14 +02:00
Michael Niedermayer
3d73be071d
Merge commit 'ed16c2dbf47cdd7c48825b4da6e7036698e5dde1'
...
* commit 'ed16c2dbf47cdd7c48825b4da6e7036698e5dde1':
h261: Remove H.261 loop filter from dsputil
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 21:25:49 +02:00
Michael Niedermayer
fa871b1bde
Merge commit 'ae35d91d44c5e676af3d146bf8d05b241c467675'
...
* commit 'ae35d91d44c5e676af3d146bf8d05b241c467675':
h261: Move ff_h261_rl_table_store declaration to header file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 21:09:04 +02:00
highgod0401
99186f1fd2
fix bug of finding CPU device
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 20:47:21 +02:00
Reinhard Tartler
a862c7d336
Integrate lcov/gcov into Libav
...
The gcov/lcov are a common toolchain for visualizing code coverage with
the GNU/Toolchain. The documentation and implementation of this
integration was heavily inspired from the blog entry by Mike Melanson:
http://multimedia.cx/eggs/using-lcov-with-ffmpeg/
2013-04-05 18:55:11 +02:00
Paul B Mahol
9a8f1e7295
img2dec: make use of AV_OPT_TYPE_IMAGE_SIZE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 15:42:25 +00:00
Paul B Mahol
1d5b4f9fe9
img2dec: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 15:42:25 +00:00
Paul B Mahol
d343848de2
rawvideodec: make use of AV_OPT_TYPE_IMAGE_SIZE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 15:42:24 +00:00
Paul B Mahol
9f5bb44021
rawvideodec: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 15:42:24 +00:00
Paul B Mahol
4c76600a8c
rawdec: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 15:42:24 +00:00
Paul B Mahol
3d9a789b0d
bintext: make use of AV_OPT_TYPE_IMAGE_SIZE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 15:42:24 +00:00
Paul B Mahol
33b6d215fa
bintext: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 15:42:24 +00:00
Christophe Gisquet
37a9708391
x86: sbrdsp: implement SSE neg_odd_64
...
Timing on Arrandale:
C SSE
Win32: 57 44
Win64: 47 38
Unrolling and not storing mask both save some cycles.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 16:42:12 +02:00
Christophe Gisquet
0b467a6e83
x264asm: fix cmp* number of arguments
...
cmp{p,s}{s,d} instructions do take an imm8 operand.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 16:42:12 +02:00
Paul B Mahol
8c43fd8654
tty: make use of AV_OPT_TYPE_IMAGE_SIZE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 14:30:56 +00:00
Paul B Mahol
20343219d2
tty: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 14:24:40 +00:00
Michael Niedermayer
29a4221ad3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libopenjpeg: Add support for XYZ colorspace, found in DCINEMA frames
Conflicts:
libavcodec/libopenjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 12:52:23 +02:00
Stefano Sabatini
029cca6fb3
doc/filters: clarify example explanation
2013-04-05 12:47:10 +02:00
Stefano Sabatini
89d581f15e
doc/filters: fix old broken syntax of color source in overlay example
...
Found-By: littlebat <dashing.meng@gmail.com>
2013-04-05 12:47:10 +02:00
Michael Niedermayer
8e85b69d71
Merge commit '8c65264595d5a82c56ae5043320e4b875a414229'
...
* commit '8c65264595d5a82c56ae5043320e4b875a414229':
pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
img2: Add j2k file extension for JPEG 2000
Conflicts:
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 12:39:06 +02:00
Diego Biurrun
52cd84d4d4
h261: Move mvmap table to the only place it is used
2013-04-05 12:25:12 +02:00
Diego Biurrun
0404ec619d
h261: cosmetics: Move functions to avoid forward declarations
2013-04-05 12:25:12 +02:00
Diego Biurrun
b78f81c803
h261: K&R formatting and prettyprinting cosmetics
2013-04-05 12:25:12 +02:00
Diego Biurrun
66ac3dbf1e
h261: Move function declarations to h261.h
2013-04-05 12:25:12 +02:00
Diego Biurrun
ed16c2dbf4
h261: Remove H.261 loop filter from dsputil
...
There is no arch-optimized version of the H.261 loop filter and there
likely will never be, so the dsputil overhead does not give any benefit.
2013-04-05 12:24:28 +02:00
Diego Biurrun
ae35d91d44
h261: Move ff_h261_rl_table_store declaration to header file
2013-04-05 12:24:28 +02:00
Stefano Sabatini
495ed19b5b
cmdutils: remove error message from opt_default() in case of missing option
...
A similar error message is generated by the calling function, avoid
duplication and spurious error message occurring with negated boolean
options introduced in 8bb5680
, which can be reproduced for example with
the command:
ffmpeg -f lavfi -i testsrc=d=0.1 -nostdin -f null -
2013-04-05 10:48:32 +02:00
Stefano Sabatini
9b4d9d8795
doc: enable compilation of -all tool pages
...
In particular, add documentation configuration system, through the
doc/config.texi file.
Fix trac issue #2374 .
2013-04-05 10:11:57 +02:00
Stefano Sabatini
702e743827
doc: move ffmpeg-scaler.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
Stefano Sabatini
a6cd26fc93
doc: move ffmpeg-resampler.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
Stefano Sabatini
a7990287aa
doc: move ffmpeg-devices.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
Stefano Sabatini
2086c7e173
doc: move ffmpeg-formats.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
Stefano Sabatini
d5f3a0c221
doc: move ffmpeg-codecs.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
Paul B Mahol
2b26077c95
lavfi/blend: use standard options parsing
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 00:14:55 +00:00
Paul B Mahol
a95e683867
lavfi/noise: use standard options parsing
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 00:14:55 +00:00
Paul B Mahol
659672f3ee
lavfi/afade: use standard options parsing
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 00:14:55 +00:00
Andrew Van Til
8df46c65cf
rtpdec: Increase max rtp packet size to 8192
...
Fixes Ticket2314
Fixes connecting to "Ceton InfiniTV4 PCIe & USB"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 01:48:55 +02:00
Andrew Van Til
5ed9eebc24
rtsp/rtp_read_header: Use RTP_MAX_PACKET_LENGTH instead of 1500
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 01:48:55 +02:00
Stefano Sabatini
c430eb2d58
doc/filters: fix erroneously truncated comment on a scale example
2013-04-05 01:18:06 +02:00
Stefano Sabatini
e80bc76e9e
doc/filters: put separated geq variables in separate lines
...
Make clear that they are not aliases for the same variable.
2013-04-05 01:18:06 +02:00
Paul B Mahol
faf689c7eb
xbmenc: remove unused code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-04 22:43:26 +00:00
Paul B Mahol
08b31a72db
xwdenc: remove unused code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-04 22:43:25 +00:00
Paul B Mahol
77535bb3c3
bmpenc: get rid of BMPContext as it is unused
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-04 22:43:25 +00:00
Paul B Mahol
bd252ff6fa
lavfi/smptebars: fix invalid writes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-04 22:10:42 +00:00
Michael Niedermayer
0f8435c089
doc: document -v repeat
...
Thanks-to: Derek Buitenhuis
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 23:36:57 +02:00
Michael Niedermayer
0a512e347f
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavc: use packet duration for subtitles if necessary.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 21:19:45 +02:00
Nicolas Bertrand
28a807e28b
libopenjpeg: Add support for XYZ colorspace, found in DCINEMA frames
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-04 19:53:07 +02:00