Michael Niedermayer
3b12335395
swscale/x86/hscale_fast_bilinear_simd: Remove ancient out-commented debug code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 23:58:08 +02:00
James Almer
28eaf46da9
doc/APIchanges: fill missing versions and hashes
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-05-07 18:56:26 -03:00
James Almer
e0a403e1c2
vp9: add missing changelog and APIchanges entries for new VP9 profiles
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-05-07 18:35:12 -03:00
Tom Butterworth
288dc5b4a1
avcodec/s3tc: fix alpha decoding when dimensions are not a multiple of 4
...
Fix alpha position error for edge blocks of odd-dimensioned frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 23:10:56 +02:00
Michael Niedermayer
b1b0baa3d6
avcodec/g2meet: Check init_get_bits8() return value
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 22:50:39 +02:00
Michael Niedermayer
43e94d5af4
avcodec/g2meet: Use init_get_bits8()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 22:50:23 +02:00
Michael Niedermayer
5f0ebe865c
ffprobe: Use av_packet_side_data_name() to find the side data name
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 21:20:26 +02:00
Michael Niedermayer
a7dd933b81
avcodec: Add av_packet_side_data_name()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 21:01:37 +02:00
Michael Niedermayer
daea320969
avcodec/txd: Fix input size checks for dxt1/3 for dimensions % 4 != 0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 19:11:01 +02:00
Tom Butterworth
873d7e0e63
avcodec/s3tc: fix decoding when dimensions are not a multiple of 4
...
Image dimensions were rounded down causing rows to wrap early if dimensions were not a multiple of 4.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 18:32:36 +02:00
Andreas Cadhalpun
584cc1ade1
aacsbr: break infinite loop in sbr_hf_calc_npatches
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 17:32:23 +02:00
Shivraj Patil
7174df44fe
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC uni copy, uni horizontal and uni vertical mc functions
...
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 16:47:34 +02:00
James Almer
aa70801aaf
ripemd: move ripemd{256, 320} into separate functions
...
This allows the removal of a few branches.
Before:
lavu RIPEMD-160 size: 1048576 runs: 1024 time: 7.052 +- 0.010
After:
lavu RIPEMD-160 size: 1048576 runs: 1024 time: 6.865 +- 0.015
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 15:40:56 +02:00
Michael Niedermayer
cc77bb09e4
avcodec/x86/vp9dsp_init: Fix mix of declaration and statement
...
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 14:33:10 +02:00
Michael Niedermayer
a6153977df
avcodec/vp9dsp: Replace assert by av_assert0()
...
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 14:32:50 +02:00
Michael Niedermayer
b28d5c49f7
Merge remote-tracking branch 'rbultje/vp9-profile23-wip'
...
* rbultje/vp9-profile23-wip:
libvpxdec: add 440 pixfmts.
vp9: add profile 2/3 fate tests.
vp9: add inter-frame profile 2/3 suport.
vp9: add keyframe profile 2/3 support.
vp9: parse profile 2/3 bitdepth in frame header.
vp9: add profile 2/3 to exported profiles.
fate: add/update reference files for 440 addition.
swscale: add yuv440p10/12 pixfmts.
lavc: add yuv440p10/12 formats to aligned pixfmt list.
lavu: add yuv440p10/12 pixfmts.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 13:22:04 +02:00
Ronald S. Bultje
2293ec6ab3
libvpxdec: add 440 pixfmts.
2015-05-07 07:19:52 -04:00
Ronald S. Bultje
b8077d7a3b
vp9: add profile 2/3 fate tests.
2015-05-07 07:19:49 -04:00
Michael Niedermayer
9253cc496a
avcodec/diracdec: Replace default_bsep[] by multiplication
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 05:07:55 +02:00
Michael Niedermayer
21b30947f2
swscale/x86/hscale_fast_bilinear_simd: Fix variable names in comments
...
Found-by: Nick Lewycky <nlewycky@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 03:57:21 +02:00
Michael Niedermayer
5f2b4a2f6a
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
lavf/img2dec: Autodetect qdraw images.
lavc/qdrw: Also support real-world qdraw images.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 01:59:22 +02:00
Michael Niedermayer
bc6f84fff7
avdevice/dshow_capture: avoid #ifdef, use ff_dlog() for dshowdebug()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 01:49:54 +02:00
Carl Eugen Hoyos
2279de6eca
lavf/img2dec: Autodetect qdraw images.
2015-05-07 01:21:08 +02:00
Carl Eugen Hoyos
b453e76842
lavc/qdrw: Also support real-world qdraw images.
2015-05-07 01:21:08 +02:00
Michael Niedermayer
223a859853
swresample/dither_template: Do not define macro functions to nothing
...
This avoids potential warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 01:07:30 +02:00
Michael Niedermayer
3e14ed05f1
avformat/internal: always check arguments of hex_dump_debug()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 01:05:45 +02:00
Michael Niedermayer
374cf93548
avformat/asfdec: do not define print_guid() to nothing
...
This avoid potential warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 00:54:06 +02:00
Michael Niedermayer
0c015aa95c
avcodec/tableprint_vlc: Do not define functions to nothing
...
This avoids potential warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 00:52:47 +02:00
Michael Niedermayer
2284c38e4c
Merge commit 'e0010bb91fc0b067be8aefd2f77e6838537da433'
...
* commit 'e0010bb91fc0b067be8aefd2f77e6838537da433':
mux: Do not leave stale side data pointers in ff_interleave_add_packet()
Conflicts:
libavformat/mux.c
See: bfb3ed1a9d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 22:37:18 +02:00
Michael Niedermayer
0318013afc
Merge commit '6c8c7c246280cdcd23e4d99006b95245ae837278'
...
* commit '6c8c7c246280cdcd23e4d99006b95245ae837278':
dump: Print AVAudioServiceType side data
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 22:29:19 +02:00
Michael Niedermayer
1caff5731d
Merge commit '04070dbca0688ab1e24528ce5c135254a9a79c47'
...
* commit '04070dbca0688ab1e24528ce5c135254a9a79c47':
libx265: Fix 'braces around scalar initializer' warning
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 21:46:52 +02:00
Michael Niedermayer
20ce69e5f8
Merge commit 'd81fb63d87692765c004c19934b49427df434a07'
...
* commit 'd81fb63d87692765c004c19934b49427df434a07':
fate: Add a PICT test
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 21:21:00 +02:00
Ronald S. Bultje
23ba4538f9
vp9: add inter-frame profile 2/3 suport.
2015-05-06 15:10:41 -04:00
Ronald S. Bultje
b224b165cb
vp9: add keyframe profile 2/3 support.
2015-05-06 15:10:41 -04:00
Ronald S. Bultje
346ce5da19
vp9: parse profile 2/3 bitdepth in frame header.
2015-05-06 15:10:40 -04:00
Ronald S. Bultje
01e59d48ed
vp9: add profile 2/3 to exported profiles.
2015-05-06 15:10:40 -04:00
Ronald S. Bultje
5c600d74aa
fate: add/update reference files for 440 addition.
2015-05-06 15:10:26 -04:00
Michael Niedermayer
ffed987a4d
Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'
...
* commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d':
lavf: Open PICT images with Quickdraw
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 21:05:16 +02:00
Michael Niedermayer
39e89f5211
Merge commit '34efb8a169e4551326e069be47125c6c2cb7ab90'
...
* commit '34efb8a169e4551326e069be47125c6c2cb7ab90':
quickdraw: Support direct pixel blocks
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 20:40:26 +02:00
Michael Niedermayer
251f9dcf22
Merge commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f'
...
* commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f':
quickdraw: Switch to greedy parsing
Conflicts:
libavcodec/qdrw.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 20:32:52 +02:00
Michael Niedermayer
d423fc12e6
Merge commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162'
...
* commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162':
quickdraw: Convert to bytestream2
Conflicts:
libavcodec/qdrw.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 20:23:54 +02:00
Michael Niedermayer
958ddef46c
Merge commit '01fdfa51aca9086e04bd354fe3f103a49352c085'
...
* commit '01fdfa51aca9086e04bd354fe3f103a49352c085':
xcbgrab: Accept geometries matching the screen size
See: 7971fa9ce0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 20:10:51 +02:00
Ronald S. Bultje
711d8812ad
swscale: add yuv440p10/12 pixfmts.
2015-05-06 12:04:31 -04:00
Ronald S. Bultje
57f970a704
lavc: add yuv440p10/12 formats to aligned pixfmt list.
2015-05-06 12:04:31 -04:00
Ronald S. Bultje
98f7f0f7e8
lavu: add yuv440p10/12 pixfmts.
2015-05-06 12:04:31 -04:00
Andreas Cadhalpun
75fc81c831
diracdec: check that block length is valid
...
In init_planes p->xblen and p->yblen are set to:
p->xblen = s->plane[0].xblen >> s->chroma_x_shift;
p->yblen = s->plane[0].yblen >> s->chroma_y_shift;
These are later used as block_w and block_h arguments of
s->vdsp.emulated_edge_mc. If one of them is 0 it triggers an av_assert2
in emulated_edge_mc:
av_assert2(start_x < end_x && block_w > 0);
av_assert2(start_y < end_y && block_h > 0);
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 18:02:35 +02:00
Andreas Cadhalpun
4b13a542a2
dirac: use and forward error codes
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 17:50:09 +02:00
Michael Niedermayer
3c7d3d27be
tools/cws2fws: Use a similar implementation in dbgprintf() as in ff_dlog()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 16:11:50 +02:00
Michael Niedermayer
0a6b410edf
avcodec/vp8: Suppress empty body warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 16:03:56 +02:00
Michael Niedermayer
e0010bb91f
mux: Do not leave stale side data pointers in ff_interleave_add_packet()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-05-06 15:01:35 +01:00