Derek Buitenhuis
61400a1dc7
Merge commit 'd909f43b5c773a73c8d526638744547ba4aa8c59'
...
* commit 'd909f43b5c773a73c8d526638744547ba4aa8c59':
vc1dec: wmv2dec: Validate ff_intrax8_common_init return value
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
f64b53f2bf
Merge commit '0372e73f917e72c40b09270f771046fc142be4a7'
...
* commit '0372e73f917e72c40b09270f771046fc142be4a7':
intrax8: Check and propagate errors from ff_intrax8_common_init
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
c29ac4abb8
Merge commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345'
...
* commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345':
intrax8: Move documentation from implementation to header file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
ba5bcf9612
Merge commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950'
...
* commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950':
intrax8: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
7120bff0a3
Merge commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13'
...
* commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13':
intrax8: Adjust printf conversion specifier for sizeof expression
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
2c3e38f44f
Merge commit '42244ce07a1f4f5108ae86d50fe72db785d483ed'
...
* commit '42244ce07a1f4f5108ae86d50fe72db785d483ed':
intrax8: Move a comment to the place it corresponds
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
e445b80c74
Merge commit '750562549ceef268b29b94f6a887d9cf331a8c78'
...
* commit '750562549ceef268b29b94f6a887d9cf331a8c78':
intrax8: Wrap multiline macros in do{}while(0) clauses
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
909f5e7100
Merge commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4'
...
* commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4':
intrax8: Move error resilience out of intrax8
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
dff9894acd
Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'
...
* commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc':
nuv: Use the correct context for av_image_check_size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
d9357332ae
Merge commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a'
...
* commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a':
indeo4: Consistently initialize variables
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
1117d6f4b1
Merge commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721'
...
* commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721':
indeo4: Rework stream analysis report
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
98e3153fa3
Merge commit '4426540f0c3ee516662f79d0a6ab5b95503b6611'
...
This commit is a no-op. We will do this when we convert ffmpeg.c
* commit '4426540f0c3ee516662f79d0a6ab5b95503b6611':
avconv: switch to the new BSF API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
af9cac1be1
Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'
...
* commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab':
lavc: add a new bitstream filtering API
Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com>
Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Michael Niedermayer
6d160afab2
avfilter/vf_readvitc: Use avpriv_frame_get_metadatap() avoid direct access to AVFrame.metadata (to comply to API)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Ronald S. Bultje
ee729cc0ed
vp9: ignore frame_context_index field in key-/intraonly-frames.
...
Reproduces a bug to remain consistent with libvpx' behaviour.
9 years ago
Ronald S. Bultje
6135aed0d2
vf_scale: support bt2020 in in/out_color_matrix properties.
9 years ago
Michael Niedermayer
c8d95e5ceb
avfilter/colorspacedsp_template: Add argument protecting () to avg()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Paul B Mahol
7a0aee1688
avcodec/takdec: fix decoding of some sample rates with multichannel coder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Ivan
3a727606c4
avcodec/h264: Fix for H.264 configuration parsing
...
Sometimes video fails to decode if H.264 configuration changes mid stream.
The reason is that configuration parser assumes that nal_ref_idc is equal to 11b
while actually some codecs but 01b there. The H.264 spec is somewhat
vague about this but it looks like it allows any non-zero nal_ref_idc for sps/pps.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
James Almer
b63ba3a517
avformat/hashenc: add missing avio_flush to hash_write_trailer
...
It was accidentally deleted in the previous hashenc commit
Signed-off-by: James Almer <jamrial@gmail.com>
9 years ago
Michael Niedermayer
487c346d98
avcodec/exr: Fix "libavcodec/exr.c:1494:13: warning: ISO C90 forbids mixed declarations and code"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
618032da0d
fate: add test for Ticket4816 (PNG decoding with alpha)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Rostislav Pehlivanov
9e138c4813
vc2enc: use 32x16 slices by default
...
Approximately 1.25 times faster than 64x32, visually and
statistically improves quality.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
9 years ago
Rostislav Pehlivanov
77fb7177af
vc2enc: don't require interlacing for 1080p50/60 base video formats
...
Typo
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
9 years ago
Tobias Rapp
2aad631a81
avfilter: add readvitc filter
...
Add a filter to scan the top lines of video frames for vertical interval
timecode (VITC) information and attach it as metadata keys.
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
9 years ago
Michael Niedermayer
60517c3ad6
avfilter/af_hdcd: Fix informations typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
c4fad02779
avformat/matroskaenc: Undo bits_per_coded_sample change as bits_per_raw_sample is available again
...
Reminded-by: James Almer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Carl Eugen Hoyos
a676c29af5
lavf/bink: Cosmetics: Reindent after last commit.
9 years ago
Carl Eugen Hoyos
6d39132fd4
lavf/bink: Support Monkey Island 4 (SMUSH) files.
...
Fixes ticket #5410 .
9 years ago
Carl Eugen Hoyos
139cbeb75e
lavc/dds: Fix GRAY8A decoding.
...
Fixes ticket #4667 .
9 years ago
Michael Niedermayer
f07923253a
avcodec/avcodec: Document signed/unsignedness of sample formats in relation to bits_per_raw_sample
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
bcf936eaea
avcodec/utils: Add braces to framecount computation
...
Suggestes-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
a7fa1e38ca
avcodec/utils: Fix duration of ATRAC3 packets
...
Fixes ticket1680
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Benjamin Steffes
0cfe16437f
lavfi/af_hdcd: Implement high definition audio cd filtering.
...
Fixes ticket #4441 .
9 years ago
James Almer
bb505cd505
avformat/hashenc: simplify hash_write_trailer
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years ago
Michael Niedermayer
21acc4db5f
avcodec: Add bits_per_raw_sample to AVCodecParameters
...
The bits_per_raw_sample represents the number of bits of precision per sample.
The field is added at the logical place, not at the end as the code was just
recently added
This fixes the regression about losing the audio sample precision information
The change in the fate test checksum un-does the change from the merge
Previous version reviewed by: wm4 <nfxjfg@googlemail.com>
Previous version reviewed by: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
James Almer
c8ed93efcf
avformat/yop: alloc codecpar extradata only once
...
Fixes memleak
Signed-off-by: James Almer <jamrial@gmail.com>
9 years ago
Paul B Mahol
9cd2ca9966
avcodec/ralf: add support for mono
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Paul B Mahol
c9fb81ff41
avcodec/atrac3: pass AVCodecContext to av_log if available
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Paul B Mahol
323b8c95e4
avformat: add AVFormatContext to ff_get_extradata()
...
Needed for av_log() inside that function.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Michael Niedermayer
8e26bdd59b
avcodec/bmp_parser: Ensure remaining_size is not too small in startcode packet crossing corner case
...
Fixes Ticket 5438
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Derek Buitenhuis
e1a8f7818c
Merge commit 'a2d1922bde8db2cdac95051918fe81ae18c0376b'
...
This commit is a no-op.
* commit 'a2d1922bde8db2cdac95051918fe81ae18c0376b':
takdec: ensure chan2 is a valid channel index
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
0520d573db
Merge commit '9765549f551ff40869aee1a6492b6a976c86cfe9'
...
* commit '9765549f551ff40869aee1a6492b6a976c86cfe9':
mpegts: Forward the errors on mpeg4 objects parsing
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
8688d3af39
Merge commit '07a844f32ebb78503981df017fa3ebfedb75fe1c'
...
* commit '07a844f32ebb78503981df017fa3ebfedb75fe1c':
lavfi: generic hardware surface upload and download filters
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
28abb216cb
Merge commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4'
...
* commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4':
lavu: VAAPI hwcontext implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
eb2da769bd
Merge commit 'd264c720f7b74286840719e506daba39f83b438b'
...
* commit 'd264c720f7b74286840719e506daba39f83b438b':
lavu: deprecate AV_PIX_FMT_VAAPI_*, replace with AV_PIX_FMT_VAAPI
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
afccfaf26a
Merge commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09'
...
* commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09':
lavu: add a way to query hwcontext frame constraints
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
7af788aa62
Merge commit '1098f5c0495c61a98d4ff6b8e24c17974d4bace5'
...
* commit '1098f5c0495c61a98d4ff6b8e24c17974d4bace5':
svq3: Use a separate buffer for decoding the slices
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
James Almer
0efafc5849
avformat/framehash: enable new output
...
Also, make every addition except for sidedata part of version 1 instead of the
new version 2.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
James Almer
868bce48f6
avformat/framehash: add sidedata checksum
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years ago