OSDN Git Service
Michael Niedermayer [Fri, 16 Aug 2013 23:38:53 +0000 (01:38 +0200)]
ffv1enc: propagate error code from write_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 23:38:32 +0000 (01:38 +0200)]
ffv1enc: check for malloc failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 5 Jul 2013 16:33:30 +0000 (18:33 +0200)]
lavf/tee: add support for bitstream filtering
This allows to apply different bitstream filters to different outputs,
with no need to transcode.
Michael Niedermayer [Fri, 16 Aug 2013 13:56:10 +0000 (15:56 +0200)]
avcodec/dirac_dwt: Remove unused ff_spatial_idwt2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 13:55:19 +0000 (15:55 +0200)]
avfilter/vf_mp: remove unused sws related functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 13:35:00 +0000 (15:35 +0200)]
avfilter: remove ff_copy_int*_list
The functions are unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 13:01:47 +0000 (15:01 +0200)]
swscale: change ff_dither_8x8_128 dimensions to be consistent with the others
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 14 Aug 2013 21:34:27 +0000 (21:34 +0000)]
lavfi/transpose: call av_frame_copy_props()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 14 Aug 2013 19:01:06 +0000 (19:01 +0000)]
lavfi/transpose: support slice threading
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 14 Aug 2013 21:51:27 +0000 (21:51 +0000)]
lavfi/tile: make color of blank/unused area configurable
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 16 Aug 2013 12:21:34 +0000 (14:21 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
altivec: perform an explicit unaligned load
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 12:04:57 +0000 (14:04 +0200)]
Merge commit '
9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a'
* commit '
9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a':
hlsenc: Don't reset the number variable when wrapping
Conflicts:
libavformat/hlsenc.c
See:
75b9fb27f516f9db7995ab2c2abb83e25cae5813
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 11:54:38 +0000 (13:54 +0200)]
Merge commit '
09c93b1b957f2049ea5fd8fb0e6f4d82680172f2'
* commit '
09c93b1b957f2049ea5fd8fb0e6f4d82680172f2':
hlsenc: Append the last incomplete segment when closing the output
Conflicts:
libavformat/hlsenc.c
See:
4630dfd1ebb6550f352ea69ce7150aaaba96d413
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 11:43:31 +0000 (13:43 +0200)]
Merge commit '
c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb'
* commit '
c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb':
hlsenc: Add a proper dependency on the mpegts muxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 11:37:06 +0000 (13:37 +0200)]
Merge commit '
239f55bf3c966782b781338df284f250393b9ed6'
* commit '
239f55bf3c966782b781338df284f250393b9ed6':
vp56data: Move all data tables to the .c file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 11:19:19 +0000 (13:19 +0200)]
Merge commit '
cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7'
* commit '
cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7':
vp56data: Move all shared enum/struct declarations to common header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 11:13:58 +0000 (13:13 +0200)]
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>
Michael Niedermayer [Fri, 16 Aug 2013 11:08:09 +0000 (13:08 +0200)]
Merge commit '
ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6'
* commit '
ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6':
mpeg12decdata: Remove unused #define
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 11:01:37 +0000 (13:01 +0200)]
Merge commit '
c591d4575a6f97fbbe6145304b1ea960e8e81e14'
* commit '
c591d4575a6f97fbbe6145304b1ea960e8e81e14':
avcodec: Replace local extern declarations for tables with header #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 10:53:24 +0000 (12:53 +0200)]
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>
Michael Niedermayer [Fri, 16 Aug 2013 10:38:12 +0000 (12:38 +0200)]
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>
Michael Niedermayer [Fri, 16 Aug 2013 10:31:39 +0000 (12:31 +0200)]
Merge commit '
060ce0c697e261ca2792a7df30dfd1bae6900a4f'
* commit '
060ce0c697e261ca2792a7df30dfd1bae6900a4f':
ivi_common: Make some tables only used within the file static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 10:31:11 +0000 (12:31 +0200)]
Merge commit '
4b054a3400f728c54470ee6a1eefe1d82420f6a2'
* commit '
4b054a3400f728c54470ee6a1eefe1d82420f6a2':
rtpproto: Check the right feature detection macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 10:18:41 +0000 (12:18 +0200)]
Merge commit '
163a729725c6eb0081b0af41a7279f7d19aee86e'
* commit '
163a729725c6eb0081b0af41a7279f7d19aee86e':
electronicarts: Let functions always returning the same value return void
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 10:14:32 +0000 (12:14 +0200)]
Merge commit '
4908c8ef2706d98022bf27a5c5bca1fe109e7529'
* commit '
4908c8ef2706d98022bf27a5c5bca1fe109e7529':
electronicarts: Improve some function/variable names
Conflicts:
libavformat/electronicarts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 10:08:38 +0000 (12:08 +0200)]
Merge commit '
a90cff137b2aca89380b0acad41cd7bb05619ece'
* commit '
a90cff137b2aca89380b0acad41cd7bb05619ece':
electronicarts: comment wording fixes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 10:07:45 +0000 (12:07 +0200)]
Merge commit '
288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c'
* commit '
288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c':
electronicarts: Remove bogus function documentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 10:01:22 +0000 (12:01 +0200)]
Merge commit '
8747fce91fca6bb8e9936497f2de05c905cf43b5'
* commit '
8747fce91fca6bb8e9936497f2de05c905cf43b5':
electronicarts: K&R formatting cosmetics
Conflicts:
libavformat/electronicarts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Aug 2013 09:43:26 +0000 (11:43 +0200)]
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>
Kostya Shishkov [Wed, 14 Aug 2013 19:28:05 +0000 (15:28 -0400)]
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>
Michael Niedermayer [Fri, 16 Aug 2013 02:25:39 +0000 (04:25 +0200)]
avfilter/vf_scale+aresample: minor simpification
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Aug 2013 20:42:56 +0000 (22:42 +0200)]
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>
Carl Eugen Hoyos [Thu, 6 Jun 2013 10:09:38 +0000 (12:09 +0200)]
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>
Stefano Sabatini [Thu, 15 Aug 2013 09:33:20 +0000 (12:33 +0300)]
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>
Martin Storsjö [Thu, 15 Aug 2013 13:09:27 +0000 (16:09 +0300)]
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>
Michael Niedermayer [Wed, 14 Aug 2013 15:19:32 +0000 (17:19 +0200)]
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>
Michael Niedermayer [Thu, 15 Aug 2013 18:46:57 +0000 (20:46 +0200)]
swscale_unscaled: make dither_scale static, its not used elsewhere and has no prefix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Thu, 15 Aug 2013 12:12:47 +0000 (14:12 +0200)]
avformat/riff: add DM4V FourCC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 14 Aug 2013 16:49:14 +0000 (18:49 +0200)]
vp56data: Move all data tables to the .c file
Diego Biurrun [Wed, 14 Aug 2013 16:39:37 +0000 (18:39 +0200)]
vp56data: Move all shared enum/struct declarations to common header
Diego Biurrun [Wed, 14 Aug 2013 16:19:46 +0000 (18:19 +0200)]
mpeg12decdata.h: Move all tables to the only place they are used
Diego Biurrun [Wed, 14 Aug 2013 16:57:08 +0000 (18:57 +0200)]
mpeg12decdata: Remove unused #define
Diego Biurrun [Thu, 15 Aug 2013 10:58:41 +0000 (12:58 +0200)]
avcodec: Replace local extern declarations for tables with header #includes
Diego Biurrun [Thu, 15 Aug 2013 11:38:12 +0000 (13:38 +0200)]
swscale: Move extern declarations for tables to swscale_internal.h
Also add missing ff_ prefixes where necessary.
Diego Biurrun [Thu, 15 Aug 2013 11:29:01 +0000 (13:29 +0200)]
swscale: Mark a bunch of tables only used within one file static
Diego Biurrun [Thu, 15 Aug 2013 11:13:01 +0000 (13:13 +0200)]
ivi_common: Make some tables only used within the file static
Martin Storsjö [Thu, 15 Aug 2013 07:36:20 +0000 (10:36 +0300)]
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>
Michael Niedermayer [Thu, 15 Aug 2013 11:49:21 +0000 (13:49 +0200)]
avcodec/ffv1enc: bump minor_version for the chroma_plane fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Aug 2013 11:26:50 +0000 (13:26 +0200)]
avcodec/ffv1enc: fix chroma_plane for rgb/rgba
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Aug 2013 11:03:32 +0000 (13:03 +0200)]
ffv1: fix plane_count at version 1.4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Aug 2013 10:52:41 +0000 (12:52 +0200)]
ffv1dec: support printing information about the global header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 14 Aug 2013 16:04:36 +0000 (18:04 +0200)]
electronicarts: Let functions always returning the same value return void
Diego Biurrun [Wed, 14 Aug 2013 15:06:41 +0000 (17:06 +0200)]
electronicarts: Improve some function/variable names
Diego Biurrun [Wed, 14 Aug 2013 14:53:08 +0000 (16:53 +0200)]
electronicarts: comment wording fixes
Diego Biurrun [Wed, 14 Aug 2013 15:54:40 +0000 (17:54 +0200)]
electronicarts: Remove bogus function documentation
Diego Biurrun [Wed, 14 Aug 2013 14:45:06 +0000 (16:45 +0200)]
electronicarts: K&R formatting cosmetics
Janne Grunau [Fri, 19 Jul 2013 11:51:51 +0000 (13:51 +0200)]
8bps: decode 24bit files correctly as rgb32 on bigendian
Michael Niedermayer [Thu, 15 Aug 2013 09:29:02 +0000 (11:29 +0200)]
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>
Dave Yeo [Wed, 14 Aug 2013 22:22:13 +0000 (15:22 -0700)]
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>
Michael Niedermayer [Wed, 14 Aug 2013 17:20:13 +0000 (19:20 +0200)]
wavpackenc: simplify "sign = ((sample) < 0) ? 1 : 0;"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Aug 2013 20:56:56 +0000 (22:56 +0200)]
avcodec/lzwenc: change asserts to av_asserts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Aug 2013 20:51:06 +0000 (22:51 +0200)]
avcodec/gif: use the whole allocated buffer
Fixes some gif encoding failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Aug 2013 20:38:55 +0000 (22:38 +0200)]
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>
Michael Niedermayer [Wed, 14 Aug 2013 20:34:18 +0000 (22:34 +0200)]
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>
Alexander Strasser [Tue, 13 Aug 2013 16:36:21 +0000 (18:36 +0200)]
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
ac87eaf856e0fb51917266b899bb15d19b907baf
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Michael Niedermayer [Wed, 14 Aug 2013 16:51:13 +0000 (18:51 +0200)]
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>
Paul B Mahol [Tue, 22 Jan 2013 20:05:44 +0000 (20:05 +0000)]
WavPack encoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 14 Aug 2013 10:42:37 +0000 (12:42 +0200)]
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>
Michael Niedermayer [Wed, 14 Aug 2013 10:36:07 +0000 (12:36 +0200)]
Merge commit '
6b58e11a8331690ec32e9869db89ae10c54614e9'
* commit '
6b58e11a8331690ec32e9869db89ae10c54614e9':
rtpproto: Add an option for writing return packets to the address of the last received packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Aug 2013 10:30:35 +0000 (12:30 +0200)]
Merge commit '
2427ac6ccd868811d1fe9df7c64c50ca58abe6f6'
* commit '
2427ac6ccd868811d1fe9df7c64c50ca58abe6f6':
rtpproto: Update the parameter documentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Aug 2013 10:22:20 +0000 (12:22 +0200)]
Merge commit '
5268bd2900effa59b51e0fede61aacde5e2f0b95'
* commit '
5268bd2900effa59b51e0fede61aacde5e2f0b95':
segafilm: Error out on impossible packet size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Aug 2013 10:11:40 +0000 (12:11 +0200)]
Merge commit '
3562684db716d11de0b0dcc52748e9cd90d68132'
* commit '
3562684db716d11de0b0dcc52748e9cd90d68132':
ogg: Always alloc the private context in vorbis_header
Conflicts:
libavformat/oggparsevorbis.c
See:
18b46a494ef3592d69f4638dac1ebb613c0f548d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Aug 2013 09:55:45 +0000 (11:55 +0200)]
Merge commit '
f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7'
* commit '
f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7':
rtjpeg: Use init_get_bits8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Aug 2013 09:51:28 +0000 (11:51 +0200)]
Merge commit '
62cc7a91080194d9ead162516f779f20931220d9'
* commit '
62cc7a91080194d9ead162516f779f20931220d9':
rtjpeg: return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Aug 2013 09:41:58 +0000 (11:41 +0200)]
Merge commit '
2df0776c2293efb0ac12c003843ce19332342e01'
* commit '
2df0776c2293efb0ac12c003843ce19332342e01':
nuv: Use av_fast_realloc
Conflicts:
libavcodec/nuv.c
This change is not merged, the long ago fixed buffer use after codec_reinit()
was a bug.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Aug 2013 08:44:55 +0000 (10:44 +0200)]
Merge commit '
feaaf5f7f0afac7223457f871af2ec9b99eb6cc6'
* commit '
feaaf5f7f0afac7223457f871af2ec9b99eb6cc6':
nuv: Reset the frame on resize
Conflicts:
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Aug 2013 08:35:38 +0000 (10:35 +0200)]
Martin Storsjö [Tue, 13 Aug 2013 10:21:35 +0000 (13:21 +0300)]
sdp: Add an option for sending RTCP packets to the source of the last packets
An SDP description normally only contains the target IP address
and port for the packets. This means that we don't really have
any clue where to send the RTCP RR packets - previously they're
sent to the destination IP written in the SDP (at the same port),
which rarely is the actual peer. And if the source for the packets
is on a different port than the destination, it's never correct.
With a new option, we can choose to send the packets to the
address that the latest packet on each socket arrived from.
---
Some may even argue that this should be the default - perhaps,
but I'd rather keep it optional at first. Additionally, I'm not
sure if sending RTCP RR directly back to the source is
desireable for e.g. multicast.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 13 Aug 2013 10:20:42 +0000 (13:20 +0300)]
rtpproto: Add an option for writing return packets to the address of the last received packets
If we've received packets on the same socket before, the return
packets are sent to that address. If we've only received packets
on the other socket, try to guess the source port for the other
one assuming the basic +1/-1 logic.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 14 Aug 2013 08:07:38 +0000 (10:07 +0200)]
Merge commit '
aae159a7cc4df7d0521901022b778c9da251c24e'
* commit '
aae159a7cc4df7d0521901022b778c9da251c24e':
nuv: Do not ignore lzo decompression failures
Conflicts:
libavcodec/nuv.c
tests/ref/fate/nuv-rtjpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Aug 2013 00:11:30 +0000 (02:11 +0200)]
ffmpeg_filter: check that the input media type match the filter
Fixes Ticket2012
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Tue, 13 Aug 2013 21:09:24 +0000 (23:09 +0200)]
avcodec/gsmdec: reject unsupported msn audio modes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 2 Aug 2013 22:31:11 +0000 (15:31 -0700)]
doc/filters: reformat scale filter doc
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Paul B Mahol [Fri, 9 Aug 2013 14:01:46 +0000 (14:01 +0000)]
tiff: frame multithreading support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Storsjö [Tue, 13 Aug 2013 09:19:57 +0000 (12:19 +0300)]
rtpproto: Update the parameter documentation
Move the sources documentation up below the marker for deprecated
otpions. Also mention the new block parameter, that was added
in
749722209.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 13 Aug 2013 17:36:50 +0000 (19:36 +0200)]
avcodec/mpeg12dec: check slice size before trying to decode it
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thilo Borgmann [Tue, 13 Aug 2013 08:04:05 +0000 (10:04 +0200)]
Update my email address.
Compn [Tue, 13 Aug 2013 13:41:28 +0000 (09:41 -0400)]
riff: add msn audio comment
Michael Niedermayer [Tue, 13 Aug 2013 12:32:42 +0000 (14:32 +0200)]
avcodec: free priv_data in avcodec_copy_context()
Fixes memleak
Fixes Ticket2216
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Aug 2013 13:17:58 +0000 (15:17 +0200)]
ffserver: allocate rc_eq, prevent freeing invalid pointer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 13 Aug 2013 12:31:31 +0000 (14:31 +0200)]
avcodec: clarify documentation of avcodec_copy_context()
Following this is not strictly needed but safes some malloc+free
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 13 Aug 2013 05:40:38 +0000 (07:40 +0200)]
segafilm: Error out on impossible packet size
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Paul B Mahol [Tue, 13 Aug 2013 12:42:01 +0000 (12:42 +0000)]
lavfi/ebur128: fix typo: s/negociation/negotiation
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Luca Barbato [Tue, 13 Aug 2013 05:28:41 +0000 (07:28 +0200)]
ogg: Always alloc the private context in vorbis_header
It is possible to have an initial broken header and then valid packets.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Tue, 13 Aug 2013 05:05:28 +0000 (07:05 +0200)]
rtjpeg: Use init_get_bits8
CC:libav-stable@libav.org
Luca Barbato [Sun, 11 Aug 2013 18:32:40 +0000 (20:32 +0200)]
rtjpeg: return meaningful error codes
Luca Barbato [Tue, 13 Aug 2013 05:01:40 +0000 (07:01 +0200)]
nuv: Use av_fast_realloc
The decompressed buffer can be used after codec_reinit, so it must be
preserved.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Tue, 13 Aug 2013 04:01:48 +0000 (06:01 +0200)]
nuv: Reset the frame on resize
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Mon, 12 Aug 2013 09:34:06 +0000 (11:34 +0200)]
nuv: Pad the lzo outbuf
And properly update the buf_size with the correct size.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sun, 11 Aug 2013 22:16:12 +0000 (00:16 +0200)]
nuv: Do not ignore lzo decompression failures
Update the fate reference since the last broken frame is not decoded
anymore.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org