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>
2013-08-16 11:43:26 +02:00
ec0e0eb4c1
avfilter/vf_scale+aresample: minor simpification
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 04:26:59 +02:00
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
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
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
165b65771d
avformat/riff: add DM4V FourCC
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-15 15:46:25 +02:00
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
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
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
8ec6188263
ffv1dec: support printing information about the global header
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-15 12:58:48 +02:00
e8c0defe13
8bps: decode 24bit files correctly as rgb32 on bigendian
2013-08-15 11:50:43 +02:00
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>
2013-08-15 11:34:30 +02:00
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>
2013-08-15 10:31:43 +03:00
bfbe07670b
wavpackenc: simplify "sign = ((sample) < 0) ? 1 : 0;"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-14 23:20:25 +02:00
1a53ddd9a2
avcodec/lzwenc: change asserts to av_asserts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-14 23:15:54 +02:00
796b20fa1c
avcodec/gif: use the whole allocated buffer
...
Fixes some gif encoding failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-14 23:15:54 +02:00
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>
2013-08-14 23:15:54 +02:00
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>
2013-08-14 23:15:54 +02:00
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
2013-08-14 22:05:41 +02:00
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>
2013-08-14 19:16:38 +02:00
93f4277714
WavPack encoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-14 14:04:05 +00:00
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>
2013-08-14 12:42:44 +02:00
2425be894a
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>
2013-08-14 12:38:11 +02:00
1a01f367a4
Merge commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6'
...
* commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6':
rtpproto: Update the parameter documentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-14 12:30:40 +02:00
ab06436dbf
Merge commit '5268bd2900effa59b51e0fede61aacde5e2f0b95'
...
* commit '5268bd2900effa59b51e0fede61aacde5e2f0b95':
segafilm: Error out on impossible packet size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-14 12:25:51 +02:00
070c22d53a
Merge commit '3562684db716d11de0b0dcc52748e9cd90d68132'
...
* commit '3562684db716d11de0b0dcc52748e9cd90d68132':
ogg: Always alloc the private context in vorbis_header
Conflicts:
libavformat/oggparsevorbis.c
See: 18b46a494e
2013-08-14 12:17:02 +02:00
2bac839bd3
Merge commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7'
...
* commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7':
rtjpeg: Use init_get_bits8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-14 11:56:12 +02:00
d12bc01ec5
Merge commit '62cc7a91080194d9ead162516f779f20931220d9'
...
* commit '62cc7a91080194d9ead162516f779f20931220d9':
rtjpeg: return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-14 11:51:42 +02:00
8da4305eb5
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>
2013-08-14 11:50:40 +02:00
1dee467d26
Merge commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6'
...
* commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6':
nuv: Reset the frame on resize
Conflicts:
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-14 10:44:55 +02:00
86fe16a763
Merge commit '075dbc185521f193c98b896cd63be3ec2613df5d'
...
* commit '075dbc185521f193c98b896cd63be3ec2613df5d':
nuv: Pad the lzo outbuf
Conflicts:
libavcodec/nuv.c
See: 95e1dfee76266f6eefc6
2013-08-14 10:38:11 +02:00
b56fc18b20
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>
2013-08-14 11:21:33 +03:00
6b58e11a83
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>
2013-08-14 11:21:32 +03:00
7ec7d626a1
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>
2013-08-14 10:10:14 +02:00
640a36a05c
ffmpeg_filter: check that the input media type match the filter
...
Fixes Ticket2012
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-14 03:03:41 +02:00
1ee1a3d9f4
avcodec/gsmdec: reject unsupported msn audio modes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-13 23:59:39 +02:00
bbbd9596ad
doc/filters: reformat scale filter doc
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-08-13 23:51:08 +02:00
8a7295beeb
tiff: frame multithreading support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-13 19:29:10 +00:00
2427ac6ccd
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
2013-08-13 22:16:53 +03:00
9706401927
avcodec/mpeg12dec: check slice size before trying to decode it
...
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-13 19:36:50 +02:00
6a64b23d93
Update my email address.
2013-08-13 15:45:08 +02:00
8e0b6d82b3
riff: add msn audio comment
2013-08-13 09:41:28 -04:00
cba9a40d47
avcodec: free priv_data in avcodec_copy_context()
...
Fixes memleak
Fixes Ticket2216
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-13 15:24:30 +02:00
e85771f268
ffserver: allocate rc_eq, prevent freeing invalid pointer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-13 15:24:30 +02:00
ef36ba5e08
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>
2013-08-13 15:24:30 +02:00
5268bd2900
segafilm: Error out on impossible packet size
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-08-13 15:14:07 +02:00
11afe28b9a
lavfi/ebur128: fix typo: s/negociation/negotiation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-13 12:43:56 +00:00
3562684db7
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
2013-08-13 14:04:55 +02:00
f13fe6020e
rtjpeg: Use init_get_bits8
...
CC:libav-stable@libav.org
2013-08-13 14:04:55 +02:00
62cc7a9108
rtjpeg: return meaningful error codes
2013-08-13 14:04:55 +02:00
Michael Niedermayer
Piotr Bandurski
Janne Grunau
Dave Yeo
Alexander Strasser
Paul B Mahol
Martin Storsjö
Timothy Gu
Thilo Borgmann
Compn
Luca Barbato