Clément Bœsch
bf7d016219
Merge commit '6ac52f05a6fcadb84972c9557b28c67a416f866b'
...
* commit '6ac52f05a6fcadb84972c9557b28c67a416f866b':
dvbsub_parser: Add missing mem.h #include
Merged-by: Clément Bœsch <clement@stupeflix.com>
9 years ago
Clément Bœsch
daedfa7254
Merge commit '81f769fa129edc51c28285649c2df6da717e718f'
...
* commit '81f769fa129edc51c28285649c2df6da717e718f':
gsm: Move requant_tab table to the gsm tables file
Merged-by: Clément Bœsch <clement@stupeflix.com>
9 years ago
Clément Bœsch
0501305e38
Merge commit '42dc214323637464759354912e18b2bee1884dd1'
...
* commit '42dc214323637464759354912e18b2bee1884dd1':
mpc: Drop unused GetBitContext context member
Merged-by: Clément Bœsch <clement@stupeflix.com>
9 years ago
Clément Bœsch
c7253353f8
Merge commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e'
...
* commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e':
svq1enc: Drop unused GetBitContext context member
Merged-by: Clément Bœsch <clement@stupeflix.com>
9 years ago
Clément Bœsch
f8beca6f10
Merge commit '6d8fd614ff957af242efcd8a6a0619874382f3a4'
...
* commit '6d8fd614ff957af242efcd8a6a0619874382f3a4':
vorbis: Kill some pointless debug code
Merged-by: Clément Bœsch <clement@stupeflix.com>
9 years ago
Clément Bœsch
9afa64dfdf
Merge commit '59c6509d9f0236acbc317198eab76dab8320bced'
...
* commit '59c6509d9f0236acbc317198eab76dab8320bced':
mss2: Drop a silly assert
Merged-by: Clément Bœsch <clement@stupeflix.com>
9 years ago
Clément Bœsch
f755aa5ebd
lavc: move 2 more BITSTREAM_READER_LE definitions
...
This was mentioned to be in ae753dbd0d
but
actually wasn't.
9 years ago
Clément Bœsch
ae753dbd0d
Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'
...
* commit 'b668662939de3a02454cfc9ba3e6d10b87527a40':
get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes
The merge commit also includes changes for libavcodec/interplayacm.c and
libavcodec/truemotion2rt.c
Merged-by: Clément Bœsch <clement@stupeflix.com>
9 years ago
Clément Bœsch
543142990b
Merge commit '09c4e5c5988c0037d108c5fc2a137d9ad488f7f4'
...
* commit '09c4e5c5988c0037d108c5fc2a137d9ad488f7f4':
indeo2: Drop disabled big-endian ir2_codes table
Merged-by: Clément Bœsch <clement@stupeflix.com>
9 years ago
Clément Bœsch
9b35242370
Merge commit 'b7f98659f21dce438c33b512e25fd64b8d07c347'
...
* commit 'b7f98659f21dce438c33b512e25fd64b8d07c347':
Remove unnecessary get_bits.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com>
9 years ago
Clément Bœsch
1994a73a6b
Merge commit '2a48a75a6f508121b96b0732a9fe03a46303f579'
...
* commit '2a48a75a6f508121b96b0732a9fe03a46303f579':
sgirledec: simplify, no need to use reget buffer
This commit is a noop, see ccc3f4e710
Merged-by: Clément Bœsch <clement@stupeflix.com>
9 years ago
Clément Bœsch
ee7d01e81a
Merge commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d'
...
* commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d':
aic: add frame threading support
This commit is a noop, see 8e069eb525
Merged-by: Clément Bœsch <clement@stupeflix.com>
9 years ago
Clément Bœsch
dd1b1e3223
Merge commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9'
...
* commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9':
fate: Move Canopus decoder tests to a separate file
Merged-by: Clément Bœsch <clement@stupeflix.com>
9 years ago
Matthieu Bouron
db0af7250a
lavc/mediacodecdec_h264: add missing NAL headers to SPS/PPS buffers
...
Fixes a regression introduced by 0cd5e281df
.
9 years ago
Michael Niedermayer
8a3221cc67
avformat/mov: Check sample size
...
Fixes integer overflow
Fixes: poc.mp4
Found-by: ajax secure <ajax4sec@hotmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Martin Vignali
2bdb26b4ee
fate/webp : add test for lossy compression.
...
the result of ffmpeg decoding is binary exact with the yuv output of
official decoder (dwebp)
Signed-off-by: James Almer <jamrial@gmail.com>
9 years ago
Michael Niedermayer
c0cb53cd1f
avdevice/decklink_common: Replace rare spelling of Succesfully by 500 times more common one
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
6cc4c42226
avcodec/ccaption_dec: Fix mixed declaration and statement.
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Aman Gupta
4448f16ef5
avcodec/ccaption_dec: implement tab offset commands
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
0a72b69889
MAINTAINERS: remove 2.4 as 3.1 was released
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Clément Bœsch
8b4d6cc809
Merge commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54'
...
* commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54':
avconv: Do not copy extradata if source buffer is empty
This commit is a noop, see 4d02dfbde4
Merged-by: Clément Bœsch <u@pkh.me>
9 years ago
Clément Bœsch
e6d0acd438
Merge commit '38f99017e69bd25e88be87117237c29727c25635'
...
* commit '38f99017e69bd25e88be87117237c29727c25635':
vp9: Return the correct size when decoding a superframe
This commit is a noop, see c2f3715cb3
Merged-by: Clément Bœsch <u@pkh.me>
9 years ago
Clément Bœsch
85a52a77ce
Merge commit 'b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5'
...
* commit 'b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5':
build: Only enable symbol reduction if the compiler does proper DCE
Merged-by: Clément Bœsch <u@pkh.me>
9 years ago
Clément Bœsch
da7c918e80
Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1'
...
* commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1':
build: Simplify postprocessing of linker version script files
Merged-by: Clément Bœsch <u@pkh.me>
9 years ago
Clément Bœsch
c5566f0a94
lavc/pnm_parser: disable parsing for text based PNMs
...
P1, P2, and P3 are respectively the text versions of PBM, PGM and PPM
files.
We can not obtain the buffer size using av_imgage_get_buffer_size() as
every pixel in the picture will occupy a random size between 16 and 32
bits ("4 " and "231 " are such example).
Ideally, we could look for the next header (or EOF) in the bytestream,
but this commit is meant to fix a decoding regression introduced by
48ac4532d4
.
Fix Ticket #5670
9 years ago
Matthieu Bouron
0acc170aad
Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24'
...
* commit '535a742c2695a9e0c586b50d7fa76e318232ff24':
build: Change structure of the linker version script templates
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
9 years ago
Rick Kern
d956171813
Changelog: Add VideoToolbox encoder entry for 3.1
...
Signed-off-by: Rick Kern <kernrj@gmail.com>
9 years ago
Matthieu Bouron
0fd76d77d6
Merge commit '5b1b495c8d21600eac694d50f428654a3125e217'
...
* commit '5b1b495c8d21600eac694d50f428654a3125e217':
build: Print a message when generating version scripts
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
9 years ago
Matthieu Bouron
9eb3da2f99
asm: FF_-prefix internal macros used in inline assembly
...
See merge commit '39d6d3618d48625decaff7d9bdbb45b44ef2a805'.
9 years ago
Matthieu Bouron
39d6d3618d
Merge commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e'
...
* commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e':
asm: FF_-prefix internal macros used in inline assembly
This commit is a noop as the ASM codebase differs too much between libav
and ffmpeg. The corresponding chunks will be found in the next commit.
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
9 years ago
Paul B Mahol
d693392886
avformat/mov: parse rtmd track timecode
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Marton Balint
b18d6c5800
avdevice/decklink: fix mingw portability
...
Fixes ticket #5669 .
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
Rick Kern
729d82abae
configure: use c++98 for c++ files
...
Use c++98 standard instead of c++11.
Signed-off-by: Rick Kern <kernrj@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Martin Vignali
bd2cec7021
fate/webp : add test for webp lossless decoding (rgb and rgba)
...
output have been compared with official decoding tool output (dwebp)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Martin Vignali
971ee09d32
fate/exr : add tests for file with half and float channels
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
James Almer
c6f2d1a21f
changelog: fix entry order
...
Signed-off-by: James Almer <jamrial@gmail.com>
9 years ago
James Almer
069fd69662
Update FFmpeg 3.1 cut marker
...
Signed-off-by: James Almer <jamrial@gmail.com>
9 years ago
Marton Balint
cf0a05668b
avdevice/decklink: add support for setting input packet timestamp source
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
Marton Balint
da89c6e37c
avdevice/decklink: add support for audio and video input selection
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
Marton Balint
8f9fa49bd8
avdevice/decklink: add support for setting duplex mode
...
This patch also makes BlackMagic drivers v10.6.1 a hard requirement.
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
Marton Balint
e22760aafd
avdevice/decklink: always free decklink resources on error
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
Marton Balint
38d75fe906
avdevice/decklink: factorize device finder function
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
Marton Balint
4ce0a77ec8
avdevice/decklink: remove unused itermode iterators
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
Marton Balint
1fc85d8511
avdevice/decklink: factorize cleanup function to common code
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
Marton Balint
340cea9f22
avdevice/decklink_dec: fix bitrate calculations
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
Michael Niedermayer
e9394ca63d
avcodec/libopenjpegenc: Set numresolutions by default to a value that is not too large
...
Fixes issues with libopenjpeg 2.1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Hendrik Leppkes
c142dc203e
Merge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50'
...
* commit 'dc40a70c5755bccfb1a1349639943e1f408bea50':
Drop unnecessary libavutil/x86/asm.h #includes
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
5e418fd63a
Merge commit '5264e7ba217b3c0ceae813917134e1ab52573141'
...
* commit '5264e7ba217b3c0ceae813917134e1ab52573141':
ac3: Check the array bound before dereferencing
See d85ebea3f3
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
f2a3798ea4
Merge commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84'
...
* commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84':
vaapi_h264: Add trivial support for low-power encoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
d3327b7eda
Merge commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b'
...
* commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b':
vaapi_h264: Fix frame_num after non-reference frames
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago