Michael Niedermayer
694f9ab1ef
Merge commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1'
...
* commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1':
Revert "mov: Double-check that alias path is not an absolute path"
Conflicts:
libavformat/mov.c
See: c9c7263e58
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 14:40:53 +02:00
Michael Niedermayer
441d5a7084
Merge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37'
...
* commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37':
h264: Add support for Closed Caption export
Conflicts:
libavcodec/h264.c
libavcodec/h264_sei.c
See: 8234f0e3b4
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 14:13:19 +02:00
Paul B Mahol
ec6bef68f1
avfilter: bump minor and add Changelog entry
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-17 11:39:52 +00:00
Paul B Mahol
297df52f30
avfilter/af_compand: fix clipping with default options
...
Decays and attacks where by default set only for first channel
which caused poor defaults to be used which produced clipping
on any higher channel.
Reported-by: lachs0r
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-17 11:29:29 +00:00
LoRd_MuldeR
21436b95dc
avfilter: add Dynamic Audio Normalizer filter
2015-07-17 10:58:24 +00:00
Paul B Mahol
3b365dda5c
avfilter/af_astats: measure minimal and mean difference between two consecutive samples
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-17 09:30:03 +00:00
Vittorio Giovara
f1840b070d
Revert "mov: Double-check that alias path is not an absolute path"
...
This reverts commit 9286de0459
.
The change broke support for legit absolute file paths.
Reported-by: Maksym Veremeyenko <verem@m1stereo.tv>.
2015-07-17 01:44:22 +01:00
Kieran Kunhya
b0017579b6
h264: Add support for Closed Caption export
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-17 01:44:22 +01:00
Michael Niedermayer
8250943feb
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
lavfi/af_pan: Support a maximum of 64 channels.
lswr: Allow 64 channels internally.
lavc: Allow 64 channels internally.
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 00:54:39 +02:00
Carl Eugen Hoyos
ed5d62e509
lavfi/af_pan: Support a maximum of 64 channels.
...
The Soundflower input device supports 64 channels.
2015-07-17 00:18:29 +02:00
Carl Eugen Hoyos
a77401e1f7
lswr: Allow 64 channels internally.
2015-07-17 00:17:08 +02:00
Carl Eugen Hoyos
7f0d540188
lavc: Allow 64 channels internally.
2015-07-17 00:16:45 +02:00
Marton Balint
c8ec2109f9
avformat: bump micro version after adding concatdec features
...
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-07-17 00:12:04 +02:00
Marton Balint
5117b5e9aa
concatdec: add support for injecting packet metadata
...
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-07-17 00:12:04 +02:00
Marton Balint
25a6711c25
concatdec: add support for specifying outpoint of files
...
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-07-17 00:12:04 +02:00
Marton Balint
12d82004c5
concatdec: store eof condition in context
...
This is needed later for outpoint support which may leave the last file in a
not-eof state.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-07-17 00:12:04 +02:00
Marton Balint
7ff0137a1f
concatdec: add support for specifying inpoint of files
...
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-07-17 00:12:04 +02:00
Marton Balint
53f2ef2c4a
mxfdec: calculate the index in display order
...
This should fix seeking for open GOP files as well.
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-07-16 22:07:49 +02:00
Ivan Uskov
6e127990fa
Refactoring to move common QSV-related code part into libavcodec/qsvdec.c
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 21:30:45 +02:00
Tom Butterworth
17ee24af7e
avcodec/snappy: refactor so ff_snappy_uncompress uses an existing buffer
...
Some uses of Snappy require uncompressing to positions within an existing buffer. Also adds a function to get the uncompressed length of Snappy data.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 20:41:07 +02:00
Michael Niedermayer
c4dfb76fa7
avfilter/vf_eq: Support contrast from -1000 to 1000
...
Fixes "-vf eq=0.05,eq=20"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 18:50:24 +02:00
Paul B Mahol
51925daafd
avfilter/af_astats: make sure p->last is actually always set when measuring max difference
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-15 19:24:37 +00:00
Paul B Mahol
59a9998908
avfilter/af_astats: also measure maximal difference between two consecutive samples
...
While here also mention bit depth in documentation.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-15 19:09:57 +00:00
Tom Butterworth
6074956fa1
avcodec/hap: move some per-stream setup into decoder init rather than per-frame
...
This change will reject frames with a texture type which doesn't match the stream description.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 16:04:06 +02:00
Shivraj Patil
012ba786e6
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 MC functions
...
This patch adds MSA (MIPS-SIMD-Arch) optimizations for VP9 MC functions in new file vp9_mc_msa.c
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 15:03:02 +02:00
Rong Yan
2af180bf1b
swscale/ppc/yuv2rgb_altivec: POWER LE support in the macros vec_unh() and vec_unl()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 14:27:58 +02:00
周晓勇
0bfa176c64
avcodec: loongson optimized idctdsp with mmi
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 14:27:53 +02:00
周晓勇
dcd14db806
avcodec: loongson add constant definition
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 14:27:49 +02:00
Michael Niedermayer
f1a38264f2
avcodec/pthread_frame: clear priv_data, avoid stale pointer in error case
...
Fixes: b4b47bc2b3fb7ca710bfffe5aa969e37_signal_sigabrt_7ffff70eccc9_744_nc_sample2.avi with memlimit of 4194304
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 12:18:30 +02:00
Carl Eugen Hoyos
8dad213143
lavc: Add properties field to AVCodecContext.
...
The new field can hold information about losslessness and closed captions for now.
2015-07-16 12:18:30 +02:00
Henrik Gramner
2cb34f82b9
checkasm: Add unit tests for h264qpel
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-15 19:47:07 +02:00
Luca Barbato
4512ee78e1
mpegts: Mark the muxer as supporting variable fps
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-15 19:43:48 +02:00
Luca Barbato
c88c5eef53
hevc: Split the struct setup from the pps parsing
2015-07-15 19:39:44 +02:00
Paul B Mahol
7aafac976f
avfilter/vf_smartblur: use the name 's' for the pointer to the private context
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-15 13:34:56 +00:00
Paul B Mahol
61641627b8
avfilter/af_astats: calculate audio bit-depth
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-15 13:26:43 +00:00
Paul B Mahol
3001558487
avfilter: add erosion, dilation, deflate & inflate filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-15 13:21:47 +00:00
Michael Niedermayer
a39512ba9e
tests/checkasm/checkasm: Give macro a body to avoid potential unexpected syntax issues
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 04:35:14 +02:00
Michael Niedermayer
4afc3429be
avformat/utils: Fix regression with H264 stream probing
...
Fixes Ticket4725
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 03:37:43 +02:00
Michael Niedermayer
cdca400c5e
avformat/utils: Print stream number in max_analyze_duration exit path
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 03:30:24 +02:00
Carl Eugen Hoyos
9901e53187
lavf/rtpenc_jpeg: Fix sending multiple quantization tables.
2015-07-16 00:36:13 +02:00
Donny Yang
99b0cadd13
apng: Fix wrong default final frame delay in muxer
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 22:52:06 +02:00
Michael Niedermayer
cbd4a1dbde
Merge commit '2cb34f82b92c15b811f5c03dc7f61a4baf6e02e3'
...
* commit '2cb34f82b92c15b811f5c03dc7f61a4baf6e02e3':
checkasm: Add unit tests for h264qpel
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 22:44:28 +02:00
Michael Niedermayer
1680f9c588
Merge commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e'
...
* commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e':
mpegts: Mark the muxer as supporting variable fps
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 21:29:12 +02:00
Michael Niedermayer
4e160ecdbc
Merge commit 'c88c5eef53ff1619724ba47b722da64ec0593dab'
...
* commit 'c88c5eef53ff1619724ba47b722da64ec0593dab':
hevc: Split the struct setup from the pps parsing
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 21:21:40 +02:00
Michael Niedermayer
269a71b68a
avcodec/mpeg4videodec: Clarify the mpeg4_unpack_bframes reference.
...
This should avoid misunderstandings like in Ticket4618
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 21:05:24 +02:00
Michael Niedermayer
a5d44d5c22
swscale/utils: Clear pix buffers
...
Fixes use of uninitialized memory
Fixes: a96874b9466b6edc660a519c7ad47977_signal_sigsegv_7ffff713351a_744_nc_sample.avi with memlimit 2147483648
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 20:06:34 +02:00
Michael Niedermayer
4a6b8289e6
avcodec/mips/mpegvideo_mmi: Use av_assert2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 17:25:42 +02:00
ZhouXiaoyong
95418634b1
avcodec: loongson optimized mpegvideo dct unquantize with mmi
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 15:51:07 +02:00
周晓勇
a0ad6c85ac
avcodec: loongson optimized h264pred with mmi
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 15:51:02 +02:00
周晓勇
2c34389551
configure: loongson disable expensive optimizations in gcc O3 optimization
...
With gcc-4.9.2 loongson faild in test fate-dca, this is caused by option
-fexpensive-optimizations in -O3 optimization. We disable it temporarily
before the bug been fixed up.
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 13:24:23 +02:00