Michael Niedermayer
361bc70731
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avutil: Fix compilation with inline asm disabled on mingw
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 11:51:38 +02:00
Michael Niedermayer
85f8a3cb50
Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c'
...
* commit 'e208e6d209728d332343aa5390ae377ac0a6305c':
lavu: Add interleaved 4:2:2 8/10-bit formats
Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
See: 90ca5a9b5f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 11:42:03 +02:00
Michael Niedermayer
8310bccc91
avutil/pixdesc: try to fix NV20* descriptors
...
They where inconsistent (overlapping fields and wrong sizes)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 11:34:01 +02:00
Kieran Kunhya
90ca5a9b5f
Add interleaved 4:2:2 8/10-bit formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 10:49:29 +02:00
Luca Barbato
c951e4b442
flv: Make onTextData parsing robust
...
Certain streaming servers do not preserve the order of the fields.
2013-09-22 01:10:17 +02:00
Luca Barbato
ba77757a7e
rtmp: Replace a magic number with a macro
...
11 is the RTMP header size.
2013-09-22 01:09:33 +02:00
Luca Barbato
5840473890
rtmp: Rewrite embedded flv handling
...
Use update_offset() as done for rtmp audio, video and notifications and
read update and write the fields instead of replacing them in the rtmp
packet and then memcpying it to the output buffer.
2013-09-22 01:09:33 +02:00
Luca Barbato
e40a0e8228
rtmp: Refactor get_packet
2013-09-22 01:09:33 +02:00
Luca Barbato
32a414f316
rtmp: Support AMF_DATA_TYPE_MIXEDARRAY
...
And fix the AMF_DATA_TYPE_ARRAY parsing while at it.
A MIXEDARRAY type, as the ARRAY, store the number of elements in
an uint32 before the list. The ARRAY is strict and does not have
an OBJECT terminator, MIXEDARRAY behaves like an OBJECT type and
a different than stated number of element can be present.
2013-09-22 01:06:42 +02:00
Michael Niedermayer
e07ac727c1
avcodec/g2meet: Fix framebuf size
...
Currently the code can in some cases draw tiles that hang outside the
allocated buffer. This patch increases the buffer size to avoid out
of array accesses. An alternative would be to fail if such tiles are
encountered.
I do not know if any valid files use such hanging tiles.
Fixes Ticket2971
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 00:04:39 +02:00
Compn
5dca837ac3
changelog: add fraps and libx264 changes
2013-09-21 17:57:08 -04:00
Alex Smith
08fa828b3f
avutil: Fix compilation with inline asm disabled on mingw
...
Because of -Werror=implicit-function-declaration the build will fail.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 00:50:32 +03:00
Michael Niedermayer
21a2b97365
avformat/hls: do not limit manifest lines to 1024 chars
...
Fixes Ticket2976
Debuged-by: jaimeMF
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 20:59:30 +02:00
Kieran Kunhya
e208e6d209
lavu: Add interleaved 4:2:2 8/10-bit formats
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-09-21 17:36:15 +02:00
Michael Niedermayer
a072acb108
avcodec: fix duplicate includes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 16:59:13 +02:00
Michael Niedermayer
b8a954e46d
avformat/network: fix duplicate include
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 16:58:58 +02:00
Lukasz Marek
ef23b7fd6d
lavf/libssh: add MAINTAINERS entry
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 16:35:41 +02:00
Alex Smith
66c2f200b6
lavu/attributes: Don't define av_restrict
...
This is always defined in config.h.
Original patch by Derek Buitenhuis.
2013-09-21 15:43:31 +02:00
Michael Niedermayer
49515cb840
avformat: remove duplicate includes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 15:36:33 +02:00
Michael Niedermayer
d0c61571cf
avdevice/v4l: remove duplicate include
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 15:36:33 +02:00
Michael Niedermayer
4bc7a2a64b
avfilter: remove duplicate includes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 15:36:33 +02:00
Michael Niedermayer
0506f3fa38
avutil/cpu: remove duplicate include
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 15:36:33 +02:00
Hendrik Leppkes
1c4fa2aaf2
avcodec/fraps: use BT.709 colorspace for YUV Fraps versions
...
Based both on comparison to the reference decoder, and comments from
the fraps developers upon inquiry how to handle the yuv fraps variants.
2013-09-21 13:09:13 +00:00
Paul B Mahol
59d72f8b16
lavfi/pad,crop,scale: remove options description from filter description
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-21 12:50:02 +00:00
Paul B Mahol
8ac0eb2cd7
avfilter/vf_tinterlace: add yuv411p, yuv440p, yuva422p and yuva444p
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-21 12:48:24 +00:00
Alex Smith
eedbc2b56d
tools: Fix apparent merge failure
2013-09-21 14:40:31 +02:00
James Almer
56f17407bc
matroska: Add the CueDuration element
...
Use it only on subtitle CuePoints.
With proper demuxer/splitter support this should improve the display
of subtitles right after seeking to a given point in the stream.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 14:33:01 +02:00
Michael Niedermayer
8ad2465987
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Allow encoding YUVJ422P and YUVJ444P with libx264.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 14:07:41 +02:00
Carl Eugen Hoyos
ac82155204
Remove '-vf' from pullup documentation example.
2013-09-21 12:17:20 +02:00
Michael Niedermayer
d0171eb8d7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h264dec: Add .avc file name extension
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 11:57:19 +02:00
Michael Niedermayer
de493809f3
Merge commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9'
...
* commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9':
h264dec: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 11:09:41 +02:00
Carl Eugen Hoyos
79209f5d6c
Allow encoding YUVJ422P and YUVJ444P with libx264.
...
Reviewed-by: Reimar
2013-09-21 09:54:06 +02:00
Reimar Döffinger
f76b633a94
mpeg4dec: Ensure data is not clobbered too early.
...
Avoid overwriting the bitstream buffer data before we
have ended processing the frame.
This is necessary to fix hwaccels which might try to use
the buffer during the end_frame call.
I am not sure but it is possible this could even trigger
a use-after-free if the av_fast_malloc allocated a new buffer.
This would require that decode_slice did not wind the bitstream
forward all the way to the end, which does not currently happen in
normal streams.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-09-21 09:40:28 +02:00
Michael Niedermayer
6c169c2fa4
Merge commit '67e285ceca1cb602a5ab87010b30d904527924fe'
...
* commit '67e285ceca1cb602a5ab87010b30d904527924fe':
mem: Handle av_reallocp(..., 0) properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 09:36:58 +02:00
Paul B Mahol
f35b2fa8c9
fate: add adelay test
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-21 03:37:09 +00:00
Reimar Döffinger
29f244e08e
dvbsubdec: Check for invalid clut selector.
...
Fail decoding if strict compliance is requested.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-09-21 09:51:10 +02:00
JULIAN GARDNER
97ff584af4
Apply clut changes only to one table.
...
The specification does not allow multiple bits to be set,
but some encoders do it anyway.
Applying it only to the first seems to give better results.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-09-21 09:51:09 +02:00
Lukasz Marek
5b153f8164
lavf: add SFTP protocol via libssh
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 03:26:54 +02:00
Carl Eugen Hoyos
705b30e24f
Improve pullup documentation.
...
Mention that the fps filter should be used after pullup.
2013-09-21 03:24:24 +02:00
Michael Niedermayer
68f328fcdd
avfilter/vf_psnr: avoid 64bit arithmetic in the inner loop
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 03:11:02 +02:00
Neil Birkbeck
a11c16a0b0
avfilter/vf_psnr: Prevent integer overflow.
...
The 32-bit integer accumulator in MSE computation can overflow for 8-bit frame data.
(e.g., for 1080p white frame compared to a black frame can give sum of 255*255*1080*1920 > 2^32).
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 03:10:45 +02:00
Michael Niedermayer
15672e832f
avformat/utils: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 23:19:29 +02:00
Michael Niedermayer
fcd64dcc37
avformat/avienc: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 22:50:06 +02:00
James Almer
39442b1a1b
matroskaenc: Add CuePoints for subtitle tracks
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 22:40:16 +02:00
Vittorio Giovara
944c338430
h264dec: Add .avc file name extension
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-09-20 21:08:02 +02:00
Vittorio Giovara
01f111bdb2
h264dec: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-09-20 21:06:23 +02:00
Martin Storsjö
67e285ceca
mem: Handle av_reallocp(..., 0) properly
...
Previously this did a double free (and returned an error).
Reported-by: Justin Ruggles
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-20 21:23:08 +03:00
Michael Niedermayer
bed611f937
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h264: remove an unused static constant
Merge only for metadata as the constant us not unused in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 16:09:56 +02:00
Michael Niedermayer
8377b2b6bf
Merge commit '33b88f2a4ae54d5397c45e39a5326289ebdc7747'
...
* commit '33b88f2a4ae54d5397c45e39a5326289ebdc7747':
msvc/icl: Use __declspec(noinline)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 16:03:00 +02:00
Michael Niedermayer
e1f74ad1f0
Merge commit '09f2581dc5edb3642858d69d9a70b67e249167e9'
...
* commit '09f2581dc5edb3642858d69d9a70b67e249167e9':
msvc/icl: Use __declspec(deprecated)
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 15:51:27 +02:00