Derek Buitenhuis
54f49bd378
Merge commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6'
...
* commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6':
imgconvert: Drop outdated comment block
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
3662e55943
Merge commit 'e93aa2c9e7b3599aee6a5820760fc1a2c629dea0'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
97d5742434
Merge commit '65d29dd274a302131e2e4bc6d2b1eca4a093900c'
...
This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
b3702b6b66
Merge commit '883ad2c59ceea1ced5495b5ccc83695ed4bbb94b'
...
This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
3de3937ecd
Merge commit '8e7bea6dc6ac5b21484774a026847bec0771ab62'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
fafb18d146
Merge commit 'e9175634ec96e36873929637491189150cfce9ec'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
7daad5c441
Merge commit '472d488ebcc53bea4cdb124edb94558e72d8f23f'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
e87ace6246
Merge commit '7486418683bd2477772e03aab573cf846c12fb0d'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
f97d2d2105
Merge commit 'e59708bb9d94f67381f19344b5e021591eb711bf'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
ba7d16a303
Merge commit 'c4de754d4dac5ddae4d5a6f02798c0f560771921'
...
This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
bd7da0ae7b
Merge commit '8fd361f53b3c17c1ae13a39e030c8fa3ab4d8f1f'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Matthieu Bouron
0d733ec379
lavc/mjpegdec: speed up scan data copy
9 years ago
Derek Buitenhuis
e5b5676c00
Merge commit 'e4eb13ca77624401ea7cef1ed6ad8e2d13fd2063'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
949d6dd51c
Merge commit '09f4822e4eaf61513b9092414450f3ae920ccd9d'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
d97a6193c3
Merge commit '03ef89faf23c4851848208c9fe004cd9ef690cec'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
ea2df33052
Merge commit '4f22b138886e29f7fffa8c715673951e51be9f32'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
66eb8ce473
Merge commit 'b06cb15b9d7928bf54b639c9f9f7658c2c38bfb9'
...
One big NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
42f0ed67a3
Merge commit 'c59fec783d6540dd96540b079d753ee4a6ad2e58'
...
This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
a54422fff2
Merge commit '39571e86cb0d55536f649210a025c54e440c632b'
...
This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
257766a838
Merge commit '9cce011b1d2f66366f5d75a024c2a2f93dc2b589'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
895b888f16
Merge commit '521dc78366c6ea54b7b69426dab302a57231f81e'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
e5fe75ae2b
Merge commit 'fa66237b69c27befa788b100e73783e0f47fe1b7'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
71b79b587b
Merge commit '62825236dba31a2240e25974a3ba41c1303e4edc'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
9f18be42f0
Merge commit '81737f42c28858dad76a40284a35f7a64faa2fc7'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
711dae575d
Merge commit '46350db737a15910f468d30cf7beda16a4cc8332'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
dbbfbde085
Merge commit 'e8bc642202c10beda1ea4e93ec8492b1e39805e5'
...
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
21f9468402
avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPAT
...
Libav, for some reason, merged this as a public API function. This will
aid in future merges.
A define is left for backwards compat, just in case some person
used it, since it is in a public header.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Michael Niedermayer
0aada30510
avcodec/jpeg2000dec: More completely check cdef
...
Fixes out of array read
Fixes: j2k-poc.bin
Found-by: Lucas Leong <wmliang.tw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Paul B Mahol
75a7565bcb
avcodec/dvaudiodec: support cases when codec_tag is not set but block_align is
...
Support packets larger than block size, return single block size.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Paul B Mahol
74e8f4f674
avcodec/dvaudiodec: set channel layout
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Paul B Mahol
ce404b4d7c
avfilter/af_afade: do not duplicate curve option
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Carl Eugen Hoyos
7a90edc188
lavc/mjpegdec: Set SAR even if no resolution is available.
...
Fixes ticket #4479 .
9 years ago
Carl Eugen Hoyos
69dbecf920
lavc/h264: Show "Increasing reorder buffer" message with loglevel info.
...
See ticket #5138 for a sample.
9 years ago
Matt Oliver
b66ac803fa
avformat/mux: Fix error when writing uncoded frames.
...
commit "avpacket: Deprecate av_dup_packet" broke the use
av_interleaved_write_uncoded_frame as any input uncoded frame has an
invalid packet size that will crash when av_packet_ref tries to allocate
'size' new memory. Since the packet is a temporary created within mux.c
itself it can be used directly without needing a new ref.
Signed-off-by: Matt Oliver <protogonoi@gmail.com>
9 years ago
Andreas Cadhalpun
9079e99d2c
svq1enc: fix out of bounds reads
...
level can be 5, but there are only four codebooks.
Fixes ubsan runtime error: index 5 out of bounds for type 'int8_t
[4][96]'
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
9 years ago
Paul B Mahol
11bc4fd653
avcodec/dvaudiodec: only stereo makes sense
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Paul B Mahol
e9e623369d
avcodec: add Ulead DV audio decoder
...
Fixes #1564 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Paul B Mahol
df7b165e87
avfilter/vf_zscale: make it possible to override input frame parameters
...
Mostly useful when there is no such parameters present at all.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Ivan
a0174f6729
avformat/flvenc: copyts in FLV muxer
...
The purpose of this patch is to preserve timestamps when using ffmpeg for publishing RTMP streams, e.g. ffmpeg -i rtmp://source/stream -f flv rtmp://target/stream.
There is a setting "copyts" for that purpose. Unfortunately it doesn't work with FLV muxer because it has its own timestamp correction which makes global setting "copyts" ineffective.
This patch removes timestamp correction in FLV muxer. This means FLV will rely on ffmpeg timestamp correction which makes it possible to use copyts.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Vittorio Gambaletta (VittGam)
74658a8b4d
ffmpeg_opt: Allow -metadata option to set metadata on programs.
...
Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Vittorio Gambaletta (VittGam)
6e448fb97e
ffmpeg_opt: Move the 'process manually set programs' block above 'process manually set metadata' in open_output_file().
...
Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
f3ace85d88
avutil/opt: check for and handle errors in av_opt_set_dict2()
...
Previously errors could result in random entries to be lost.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Hendrik Leppkes
2e31434d84
swscale: add P010 input support
9 years ago
Hendrik Leppkes
c2869b4640
avutil: add P010 pixel format
...
P010 is the 10-bit variant of NV12 (planar luma, packed chroma), using two
bytes per component to store 10-bit data plus 6-bit zeroes in the LSBs.
9 years ago
Andreas Cadhalpun
38622007c4
vf_libopencv: add support for opencv 3
...
It dropped the old headers, but the replacements are already available
with opencv 2.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
9 years ago
Marton Balint
73e4565dff
lavc/libzvbi-teletextdec: add support for setting background opacity
...
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
Marton Balint
92f2a9dbc5
lavc/libzvbi-teletextdec: remove cmax variable
...
Use VBI_NB_COLORS instead.
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
Marton Balint
fe4a2cbd4d
lavc/libzvbi-teletextdec: use the built-in transparent color for transparent background
...
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
Andreas Cadhalpun
b46aae0936
build: use a link instead of changing current directory when compiling
...
If links don't work, fall back to using the full source path as was
previously done.
This should fix build failures with MSVC.
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
9 years ago
Vittorio Gambaletta (VittGam)
8b02af1e6f
avformat/mpegtsenc: Fix multi program so that it supports adding the same stream to multiple programs.
...
Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago