Michael Niedermayer
c8d89be477
ffv1enc: propagate error code from write_extradata()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-17 01:43:30 +02:00
Michael Niedermayer
eeb3fb9e62
ffv1enc: check for malloc failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-17 01:43:30 +02:00
Stefano Sabatini
faf7c35655
lavf/tee: add support for bitstream filtering
...
This allows to apply different bitstream filters to different outputs,
with no need to transcode.
2013-08-16 17:58:58 +02:00
Michael Niedermayer
29852ffc64
avcodec/dirac_dwt: Remove unused ff_spatial_idwt2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 16:07:29 +02:00
Michael Niedermayer
cbdf4d6a61
avfilter/vf_mp: remove unused sws related functions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 16:07:29 +02:00
Michael Niedermayer
247fa6c27c
avfilter: remove ff_copy_int*_list
...
The functions are unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 16:07:29 +02:00
Michael Niedermayer
c62801270f
swscale: change ff_dither_8x8_128 dimensions to be consistent with the others
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 16:06:59 +02:00
Paul B Mahol
66f1de66b8
lavfi/transpose: call av_frame_copy_props()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-16 12:40:02 +00:00
Paul B Mahol
e74a5acb40
lavfi/transpose: support slice threading
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-16 12:40:02 +00:00
Paul B Mahol
ef6718a5f7
lavfi/tile: make color of blank/unused area configurable
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-16 12:40:01 +00:00
Michael Niedermayer
d7ed473d5c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
altivec: perform an explicit unaligned load
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 14:21:40 +02:00
Michael Niedermayer
c02945b6d2
Merge commit ' 9d86bfc259'
...
* commit '9d86bfc259 ':
hlsenc: Don't reset the number variable when wrapping
Conflicts:
libavformat/hlsenc.c
See: 75b9fb27f5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 14:05:59 +02:00
Michael Niedermayer
50c0837801
Merge commit ' 09c93b1b95'
...
* commit '09c93b1b95 ':
hlsenc: Append the last incomplete segment when closing the output
Conflicts:
libavformat/hlsenc.c
See: 4630dfd1eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 14:03:44 +02:00
Michael Niedermayer
dff205cca3
Merge commit ' c9031c7c14'
...
* commit 'c9031c7c14 ':
hlsenc: Add a proper dependency on the mpegts muxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 13:43:31 +02:00
Michael Niedermayer
83386a1f62
Merge commit ' 239f55bf3c'
...
* commit '239f55bf3c ':
vp56data: Move all data tables to the .c file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 13:37:10 +02:00
Michael Niedermayer
669ea5e102
Merge commit ' cb214707a6'
...
* commit 'cb214707a6 ':
vp56data: Move all shared enum/struct declarations to common header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 13:19:24 +02:00
Michael Niedermayer
dbcee7cc5c
Merge commit ' 38f64c0330'
...
* commit '38f64c0330 ':
mpeg12decdata.h: Move all tables to the only place they are used
Conflicts:
libavcodec/mpeg12decdata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 13:13:58 +02:00
Michael Niedermayer
89f4812cda
Merge commit ' ec6c1b1d83'
...
* commit 'ec6c1b1d83 ':
mpeg12decdata: Remove unused #define
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 13:08:12 +02:00
Michael Niedermayer
b7a025092f
Merge commit ' c591d4575a'
...
* commit 'c591d4575a ':
avcodec: Replace local extern declarations for tables with header #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 13:01:44 +02:00
Michael Niedermayer
c14fc4585c
Merge commit ' aa2ba8c99e'
...
* commit 'aa2ba8c99e ':
swscale: Move extern declarations for tables to swscale_internal.h
Conflicts:
libswscale/output.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 12:56:48 +02:00
Michael Niedermayer
1ef0b8f9cc
Merge commit ' d258531502'
...
* commit 'd258531502 ':
swscale: Mark a bunch of tables only used within one file static
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 12:40:32 +02:00
Michael Niedermayer
7372177a08
Merge commit ' 060ce0c697'
...
* commit '060ce0c697 ':
ivi_common: Make some tables only used within the file static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 12:31:43 +02:00
Michael Niedermayer
e1ec7990fe
Merge commit ' 4b054a3400'
...
* commit '4b054a3400 ':
rtpproto: Check the right feature detection macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 12:31:15 +02:00
Michael Niedermayer
165e42b542
Merge commit ' 163a729725'
...
* commit '163a729725 ':
electronicarts: Let functions always returning the same value return void
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 12:25:07 +02:00
Michael Niedermayer
4195321a82
Merge commit ' 4908c8ef27'
...
* commit '4908c8ef27 ':
electronicarts: Improve some function/variable names
Conflicts:
libavformat/electronicarts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 12:14:32 +02:00
Michael Niedermayer
6bba695785
Merge commit ' a90cff137b'
...
* commit 'a90cff137b ':
electronicarts: comment wording fixes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 12:08:47 +02:00
Michael Niedermayer
6a4e55a246
Merge commit ' 288f2ffb57'
...
* commit '288f2ffb57 ':
electronicarts: Remove bogus function documentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 12:07:49 +02:00
Michael Niedermayer
a87cf3689e
Merge commit ' 8747fce91f'
...
* commit '8747fce91f ':
electronicarts: K&R formatting cosmetics
Conflicts:
libavformat/electronicarts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 12:01:22 +02:00
Michael Niedermayer
15677e7239
Merge commit ' e8c0defe13'
...
* commit 'e8c0defe13 ':
8bps: decode 24bit files correctly as rgb32 on bigendian
Conflicts:
libavcodec/8bps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 11:43:26 +02:00
Kostya Shishkov
f399e406af
altivec: perform an explicit unaligned load
...
Implicit vector loads on POWER7 hardware can use the VSX
instruction set instead of classic Altivec/VMX. Let's force
a VMX load in this case.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-16 10:08:47 +03:00
Michael Niedermayer
ec0e0eb4c1
avfilter/vf_scale+aresample: minor simpification
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 04:26:59 +02:00
Michael Niedermayer
6d246f440e
avfilter/vf_scale: generic swscale option support
...
With this all AVOptions from swscale can be set without each needing
changes to vf_scale.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-15 23:23:58 +02:00
Carl Eugen Hoyos
9d86bfc259
hlsenc: Don't reset the number variable when wrapping
...
The counter itself shouldn't be wrapped, since it is used for
determining end_pts for the next segment - only wrap the number
used for the segment file name.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-15 22:41:19 +03:00
Stefano Sabatini
09c93b1b95
hlsenc: Append the last incomplete segment when closing the output
...
Also avoid comparing NOPTS values.
Bug-id: 551
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-15 22:41:18 +03:00
Martin Storsjö
c9031c7c14
hlsenc: Add a proper dependency on the mpegts muxer
...
The hls muxer itself doesn't have any direct (object file level)
dependencies on mpegtsenc.o, and including that object file
directly doesn't ensure that it is registered so that the muxer
actually is accessible.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-15 22:41:11 +03:00
Michael Niedermayer
1e0e193240
sws: add dither enum
...
This allows specifying more dither algorithms without using up flags and
without ambiguities.
Also initialize the new field based on the flags and use it.
Note, improving the logic of the checks is left to subsequent
commits, this here only switches from flags to enum.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-15 21:39:32 +02:00
Michael Niedermayer
60e9b8556a
swscale_unscaled: make dither_scale static, its not used elsewhere and has no prefix
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-15 21:38:22 +02:00
Piotr Bandurski
165b65771d
avformat/riff: add DM4V FourCC
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-15 15:46:25 +02:00
Diego Biurrun
239f55bf3c
vp56data: Move all data tables to the .c file
2013-08-15 14:38:03 +02:00
Diego Biurrun
cb214707a6
vp56data: Move all shared enum/struct declarations to common header
2013-08-15 14:38:03 +02:00
Diego Biurrun
38f64c0330
mpeg12decdata.h: Move all tables to the only place they are used
2013-08-15 14:38:03 +02:00
Diego Biurrun
ec6c1b1d83
mpeg12decdata: Remove unused #define
2013-08-15 14:38:03 +02:00
Diego Biurrun
c591d4575a
avcodec: Replace local extern declarations for tables with header #includes
2013-08-15 14:38:03 +02:00
Diego Biurrun
aa2ba8c99e
swscale: Move extern declarations for tables to swscale_internal.h
...
Also add missing ff_ prefixes where necessary.
2013-08-15 14:38:03 +02:00
Diego Biurrun
d258531502
swscale: Mark a bunch of tables only used within one file static
2013-08-15 14:38:03 +02:00
Diego Biurrun
060ce0c697
ivi_common: Make some tables only used within the file static
2013-08-15 14:38:03 +02:00
Martin Storsjö
4b054a3400
rtpproto: Check the right feature detection macro
...
IPPROTO_IPV6 is unrelated here (it's only used in udp.c for
multicast sockopts), check for support for the sockaddr_in6
struct itself.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-15 15:35:41 +03:00
Michael Niedermayer
23606f27f0
avcodec/ffv1enc: bump minor_version for the chroma_plane fix
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-15 13:49:21 +02:00
Michael Niedermayer
1a01147d7a
avcodec/ffv1enc: fix chroma_plane for rgb/rgba
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-15 13:27:29 +02:00
Michael Niedermayer
c387c45e83
ffv1: fix plane_count at version 1.4
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-15 13:03:53 +02:00