Michael Niedermayer
83386a1f62
Merge commit '239f55bf3c966782b781338df284f250393b9ed6'
...
* commit '239f55bf3c966782b781338df284f250393b9ed6':
vp56data: Move all data tables to the .c file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
669ea5e102
Merge commit 'cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7'
...
* commit 'cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7':
vp56data: Move all shared enum/struct declarations to common header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
dbcee7cc5c
Merge commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3'
...
* commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3':
mpeg12decdata.h: Move all tables to the only place they are used
Conflicts:
libavcodec/mpeg12decdata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
89f4812cda
Merge commit 'ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6'
...
* commit 'ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6':
mpeg12decdata: Remove unused #define
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
b7a025092f
Merge commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14'
...
* commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14':
avcodec: Replace local extern declarations for tables with header #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
c14fc4585c
Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3'
...
* commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3':
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>
12 years ago
Michael Niedermayer
1ef0b8f9cc
Merge commit 'd258531502b24cb653204fe4f003c8815755bdc4'
...
* commit 'd258531502b24cb653204fe4f003c8815755bdc4':
swscale: Mark a bunch of tables only used within one file static
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
7372177a08
Merge commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f'
...
* commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f':
ivi_common: Make some tables only used within the file static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e1ec7990fe
Merge commit '4b054a3400f728c54470ee6a1eefe1d82420f6a2'
...
* commit '4b054a3400f728c54470ee6a1eefe1d82420f6a2':
rtpproto: Check the right feature detection macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
165e42b542
Merge commit '163a729725c6eb0081b0af41a7279f7d19aee86e'
...
* commit '163a729725c6eb0081b0af41a7279f7d19aee86e':
electronicarts: Let functions always returning the same value return void
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
4195321a82
Merge commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529'
...
* commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529':
electronicarts: Improve some function/variable names
Conflicts:
libavformat/electronicarts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
6bba695785
Merge commit 'a90cff137b2aca89380b0acad41cd7bb05619ece'
...
* commit 'a90cff137b2aca89380b0acad41cd7bb05619ece':
electronicarts: comment wording fixes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
6a4e55a246
Merge commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c'
...
* commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c':
electronicarts: Remove bogus function documentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
a87cf3689e
Merge commit '8747fce91fca6bb8e9936497f2de05c905cf43b5'
...
* commit '8747fce91fca6bb8e9936497f2de05c905cf43b5':
electronicarts: K&R formatting cosmetics
Conflicts:
libavformat/electronicarts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
15677e7239
Merge commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa'
...
* commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa':
8bps: decode 24bit files correctly as rgb32 on bigendian
Conflicts:
libavcodec/8bps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
ec0e0eb4c1
avfilter/vf_scale+aresample: minor simpification
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
Piotr Bandurski
165b65771d
avformat/riff: add DM4V FourCC
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Diego Biurrun
239f55bf3c
vp56data: Move all data tables to the .c file
12 years ago
Diego Biurrun
cb214707a6
vp56data: Move all shared enum/struct declarations to common header
12 years ago
Diego Biurrun
38f64c0330
mpeg12decdata.h: Move all tables to the only place they are used
12 years ago
Diego Biurrun
ec6c1b1d83
mpeg12decdata: Remove unused #define
12 years ago
Diego Biurrun
c591d4575a
avcodec: Replace local extern declarations for tables with header #includes
12 years ago
Diego Biurrun
aa2ba8c99e
swscale: Move extern declarations for tables to swscale_internal.h
...
Also add missing ff_ prefixes where necessary.
12 years ago
Diego Biurrun
d258531502
swscale: Mark a bunch of tables only used within one file static
12 years ago
Diego Biurrun
060ce0c697
ivi_common: Make some tables only used within the file static
12 years ago
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>
12 years ago
Michael Niedermayer
23606f27f0
avcodec/ffv1enc: bump minor_version for the chroma_plane fix
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
1a01147d7a
avcodec/ffv1enc: fix chroma_plane for rgb/rgba
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
c387c45e83
ffv1: fix plane_count at version 1.4
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8ec6188263
ffv1dec: support printing information about the global header
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Diego Biurrun
163a729725
electronicarts: Let functions always returning the same value return void
12 years ago
Diego Biurrun
4908c8ef27
electronicarts: Improve some function/variable names
12 years ago
Diego Biurrun
a90cff137b
electronicarts: comment wording fixes
12 years ago
Diego Biurrun
288f2ffb57
electronicarts: Remove bogus function documentation
12 years ago
Diego Biurrun
8747fce91f
electronicarts: K&R formatting cosmetics
12 years ago
Janne Grunau
e8c0defe13
8bps: decode 24bit files correctly as rgb32 on bigendian
12 years ago
Michael Niedermayer
2c959eccc6
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtpproto: Check for the right feature when reading a sockaddr_in6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Dave Yeo
c3386bd5b4
rtpproto: Check for the right feature when reading a sockaddr_in6
...
Some systems, such as OS/2, define AF_INET6 without a full
implementation.
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Michael Niedermayer
bfbe07670b
wavpackenc: simplify "sign = ((sample) < 0) ? 1 : 0;"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
1a53ddd9a2
avcodec/lzwenc: change asserts to av_asserts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
796b20fa1c
avcodec/gif: use the whole allocated buffer
...
Fixes some gif encoding failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
b4e2e03709
avcodec/lzwenc: Add 1 additional bit of padding for gif
...
This fixes issues with gimp reading animated gifs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
5dd5985e05
avcodec/gif: move BITSTREAM_WRITER_LE up
...
This prevents issues in case any header #includes put_bits.h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Alexander Strasser
dc2e4c2e53
lavf/wavdec: Fix seeking in files with unaligned offsets
...
A file with a prepended ID3 tag of an uneven length was found
in the wild.
Check if the wav data starts at an uneven offset and use that
information to correct the seeking calculation in wav_seek_tag,
which used to only seek to even byte positions.
Regression since ac87eaf856
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
12 years ago
Michael Niedermayer
dabfa80ce2
avcodec/mjpegdec: print a message when there was just a single field and no frame
...
Fixes ticket1915
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
93f4277714
WavPack encoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Michael Niedermayer
20904518e9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
sdp: Add an option for sending RTCP packets to the source of the last packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago