7b89e24151
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
bfin: vp3: Mark all binary object sections appropriately
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-22 16:08:24 +01:00
0e59e30b14
Merge commit 'ea49f60523c4f4c43cb06a35166b44478d473e51'
...
* commit 'ea49f60523c4f4c43cb06a35166b44478d473e51':
h264: skip chroma edges at the picture boundary while deblocking 4:4:4
Conflicts:
libavcodec/h264.c
See: f27b22b497
2014-01-22 16:02:12 +01:00
383d2339e0
Merge commit '8267f9363532b23b3b8b4e27491ee2d412a8aec3'
...
* commit '8267f9363532b23b3b8b4e27491ee2d412a8aec3':
configure: Set default HOSTCFLAGS/HOSTCPPFLAGS after compiler detection
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-22 15:31:52 +01:00
762c4dc082
avcodec/cinepakenc: fixes and improvements
...
Fixed/improved multistrip adaptivity.
Improved R/D by optimized codebook generation.
Support for the correct color space.
Vintage compatibility.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-22 15:23:53 +01:00
59dbc36f49
Adding Cinepak encoder
...
With permission of Tomas Härdin applied by Rl aetey.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-22 14:41:24 +01:00
19987fa18c
bfin: vp3: Mark all binary object sections appropriately
...
This fixes a leftover from e44d7c659b
2014-01-22 05:38:15 -08:00
ea49f60523
h264: skip chroma edges at the picture boundary while deblocking 4:4:4
...
This handles macroblock edges for the chroma components in the same way
as for the luma compoment for 4:4:4 streams. The Spec explicitly states
that the deblocking filter is not applied to edges at the boundary of
the picture.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2014-01-22 13:44:28 +01:00
8267f93635
configure: Set default HOSTCFLAGS/HOSTCPPFLAGS after compiler detection
...
This prevents the default HOSTCFLAGS from getting clobbered by flags
passed to configure on the command line.
2014-01-22 10:33:04 +01:00
94a52417cb
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
lavf/ftp: remove double space
lavf/libssh: fix seek with whence==SEEK_CUR
lavf/libssh: rename context variable from s into libssh
lavf/libssh: add av_cold attributes
lavf/libssh: factorize create_sftp_session function
lavf/libssh: factorize create_ssh_session function
lavf/libssh: factorize file_stat function
lavf/libssh: factorize open_file function
lavf/libssh: add private_key option
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-22 01:12:23 +01:00
9ef441c525
lavf/ftp: remove double space
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-01-22 00:41:13 +01:00
e0d124a920
lavf/libssh: fix seek with whence==SEEK_CUR
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-01-22 00:41:13 +01:00
b271aac536
lavf/libssh: rename context variable from s into libssh
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-01-22 00:41:13 +01:00
522814455c
lavf/libssh: add av_cold attributes
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-01-22 00:41:13 +01:00
7fb5f55e1e
lavf/libssh: factorize create_sftp_session function
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-01-22 00:41:13 +01:00
77fadab1be
lavf/libssh: factorize create_ssh_session function
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-01-22 00:41:13 +01:00
bf5d73b04d
lavf/libssh: factorize file_stat function
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-01-22 00:41:13 +01:00
8d3f14e11b
lavf/libssh: factorize open_file function
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-01-22 00:41:13 +01:00
7e8f304846
lavf/libssh: add private_key option
...
Allows to specify private key to use during authorization.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-01-22 00:41:13 +01:00
28bc1d94b7
avformat/mov: redesign the fps calculation
...
This uses STTS and TRUN information to calculate the fps
It seems to work with more files than the previous code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-22 00:33:38 +01:00
977abf9aed
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rgb2rgb_template: add MMX/SSE2/AVX-optimized deinterleaveBytes
Conflicts:
libswscale/x86/rgb2rgb_template.c
See: 3033cd7555
2014-01-21 22:20:26 +01:00
ef25595b71
Merge commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5'
...
* commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5':
swscale/x86/rgb2rgb: add support for AVX
Conflicts:
libswscale/x86/rgb2rgb_template.c
See: 4729b529e6
2014-01-21 22:03:28 +01:00
53feab7a4e
Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9'
...
* commit '9047491f8bcd87673eed55fb310647a03b0981e9':
swscale: add nv12/nv21->yuv420 converter
Conflicts:
libswscale/rgb2rgb.c
libswscale/rgb2rgb_template.c
See: ef627bf9ec
2014-01-21 21:55:20 +01:00
797d807869
Merge commit 'eb01a25fe1452740a7f3ae2cbaff356a5c6e7806'
...
* commit 'eb01a25fe1452740a7f3ae2cbaff356a5c6e7806':
swscale: fix stride used in planarToNv12Wrapper()
Conflicts:
libswscale/swscale_unscaled.c
See: 94d7ca2b58
2014-01-21 21:45:24 +01:00
8a77baae6e
Merge commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d'
...
* commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d':
lavc: do not force the emu edge flag
Conflicts:
libavcodec/utils.c
There should be no such bugs in ffmpeg, but merging it anyway
as its safer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21 21:26:13 +01:00
a298f934ec
Merge commit '025fd76e1a2623c858d8c686a73cc30980a314b0'
...
* commit '025fd76e1a2623c858d8c686a73cc30980a314b0':
dxtory: change error code for unexpected slice configuration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21 21:17:16 +01:00
9eb954b91d
Merge commit 'e91a3f1bdba9b4945e42c191d2e35e9844625fb4'
...
* commit 'e91a3f1bdba9b4945e42c191d2e35e9844625fb4':
dxtory: correctly handle YUV slices with average odd height
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21 21:01:36 +01:00
57a0c5fa9c
Merge commit 'ade4ecb42d2dacd18d04eb8df2afa8131e5ad653'
...
* commit 'ade4ecb42d2dacd18d04eb8df2afa8131e5ad653':
dxva2: Use correct printf format strings
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21 20:45:55 +01:00
075989c33c
Merge commit '766df7ca89a2398e71182f5f2b46053e3aa9bd69'
...
* commit '766df7ca89a2398e71182f5f2b46053e3aa9bd69':
dxva2: Add missing #includes
See: 9056d0c94a
2014-01-21 20:40:23 +01:00
f57baf743f
lavf/segment: drop pointless variable oc from seg_write_packet()
2014-01-21 20:08:36 +01:00
169065fbfb
lavf/segment: remove duplicated and inconsistent cleanup code in seg_write_packet()
...
In particular, avoid to leave around the seg->avf pointer to freed
structure, and fix crash with:
ffmpeg -f lavfi -i testsrc -c:v h264 -map 0 -f segment foo-%d.ts
2014-01-21 20:08:36 +01:00
a2e78161ce
lavf/mpegtsenc: fix weird indent
2014-01-21 20:08:36 +01:00
b539a72bba
examples/filtering_audio,video: drop call to avcodec_get_frame_defaults()
...
The avcodec_get_frame_defaults() function is deprecated and its use
doesn't seem required.
2014-01-21 20:08:36 +01:00
8e5e84c2a2
avformat/mov: Ignore the last frame for duration and fps calculation if it looks suspect
...
The used heuristic will potentially need to be finetuned
Fixes daemon404s fps.mov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21 19:48:05 +01:00
76421982d0
lossless_videodsp.asm: fix compilation.
...
Fixes these errors with nasm:
libavcodec/x86/lossless_videodsp.asm:86: error: invalid combination of opcode and operands
libavcodec/x86/lossless_videodsp.asm:88: error: invalid combination of opcode and operands
I don't know whether movd or movq was meant, but either way
maskq vs. maskd must match the mov size.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-01-21 19:46:02 +01:00
91c981857b
rgb2rgb_template: add MMX/SSE2/AVX-optimized deinterleaveBytes
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-01-21 18:03:41 +01:00
7597e6efe4
swscale/x86/rgb2rgb: add support for AVX
...
This does not yet include any actual AVX code
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-01-21 18:01:29 +01:00
9047491f8b
swscale: add nv12/nv21->yuv420 converter
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-01-21 17:55:07 +01:00
eb01a25fe1
swscale: fix stride used in planarToNv12Wrapper()
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-01-21 17:54:40 +01:00
e0ab5078a7
lavc: do not force the emu edge flag
...
The default get_buffer2() implementation (and possibly some
user ones) does not allocate edges when this flag is set, which may
expose bugs in some decoders. Until the 10 release is out, it is safer
to remove this part.
2014-01-21 17:54:09 +01:00
025fd76e1a
dxtory: change error code for unexpected slice configuration
2014-01-21 17:47:50 +01:00
e91a3f1bdb
dxtory: correctly handle YUV slices with average odd height
2014-01-21 17:47:50 +01:00
91f4394ed3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dxva2: Log errors verbosely
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21 16:02:13 +01:00
9056d0c94a
Merge commit '5b2b23f2d69e05c5fcd1c933e383fe60e185574d'
...
* commit '5b2b23f2d69e05c5fcd1c933e383fe60e185574d':
dxva2: Retry IDirectXVideoDecoder_BeginFrame()
This also adds a missig #include to prevent breaking building
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21 15:56:03 +01:00
a69dd1163b
Merge commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac'
...
* commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac':
hevc: Bound check cu_qp_delta
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21 15:42:51 +01:00
58f437c3f6
Merge commit '0d999333f96a34903448579bf13a3209deaee9da'
...
* commit '0d999333f96a34903448579bf13a3209deaee9da':
hevc: Bound check slice_qp
Conflicts:
libavcodec/hevc.c
See: aead772b58
2014-01-21 15:38:29 +01:00
5b93b2722d
Merge commit '838740e6420538ad45982da6b1d3aa3ae91307f5'
...
* commit '838740e6420538ad45982da6b1d3aa3ae91307f5':
hevc: Prevent some integer overflows
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21 15:31:04 +01:00
c7b454f7a4
Merge commit 'faf03ecba03155bb1f5416713bd01da043863b43'
...
* commit 'faf03ecba03155bb1f5416713bd01da043863b43':
hevc: Remove useless clip
See: b00a8b4d19
2014-01-21 15:29:05 +01:00
ee3e1951af
Merge commit 'a246d06fe0dc6c2ea65e95327624b4537ff9bd0d'
...
* commit 'a246d06fe0dc6c2ea65e95327624b4537ff9bd0d':
hevc: clip pixels when transquant bypass is used
See: c9fe0caf7a
2014-01-21 15:26:14 +01:00
29ba1cff2b
Merge commit 'b37e796082b2d787aff3cd5631bb89c4fd374708'
...
* commit 'b37e796082b2d787aff3cd5631bb89c4fd374708':
hevc: Use uint64 to check for tile dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21 15:19:39 +01:00
7c4b96f55e
Merge commit 'd5c15ebeaf1914ea5e3e0599d4316d7c4cf74434'
...
* commit 'd5c15ebeaf1914ea5e3e0599d4316d7c4cf74434':
hevc: Fix modulo operations
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c
See: 4ced5d7780
2014-01-21 15:12:53 +01:00
Michael Niedermayer
addr-see-the-website@aetey.se
Tomas Härdin
Diego Biurrun
Janne Grunau
Lukasz Marek
Stefano Sabatini
Reimar Döffinger
Anton Khirnov
Kostya Shishkov