Michael Niedermayer
f5b26fbc2f
Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'
...
* commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2':
avconv: Add an option for automatically rotating video according to display matrix
Conflicts:
Changelog
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 22:39:00 +02:00
Michael Niedermayer
deedf3e590
Merge commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37'
...
* commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37':
avplay: Add support for rotated video
Conflicts:
configure
doc/ffplay.texi
ffplay.c
See: 08c51e12b1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 22:31:20 +02:00
Michael Niedermayer
e874772f70
Merge commit '21180b73239c6360aa28496d4879713b7ba4a8e5'
...
* commit '21180b73239c6360aa28496d4879713b7ba4a8e5':
avplay: Factorize code for adding filters to the filter pipeline
Conflicts:
ffplay.c
See: 08c51e12b1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 22:08:11 +02:00
Michael Niedermayer
94f4bdc4f1
configure: add forgotten avcodec/avformat deps for find/cover_rect
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 21:28:31 +02:00
Michael Niedermayer
61b4ab1860
avfilter: Add cover_rect filter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 21:15:48 +02:00
Michael Niedermayer
94340e4b28
avfilter: add find_rect filter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 21:15:48 +02:00
Martin Storsjö
16302246b1
avconv: Add an option for automatically rotating video according to display matrix
...
The option is enabled by default, but can be disabled.
If this is enabled, such side data isn't copied into the output stream
(except when doing stream copy).
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-02 22:09:06 +03:00
Martin Storsjö
e2d50fc2f5
avplay: Add support for rotated video
...
This is enabled by default, but can be disbled via the -noautorotate
option.
Based on a patch by Clément Bœsch.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-02 22:06:29 +03:00
Martin Storsjö
21180b7323
avplay: Factorize code for adding filters to the filter pipeline
...
Significantly based on a patch by Clément Bœsch.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-02 22:06:29 +03:00
Michael Niedermayer
4e8ee7acb8
libavcodec/svq3: clarify unknown_flag by renaming to has_watermark
...
The name is based on how the field is used in the code
Reviewed-by: compn <tempn@mi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 15:34:02 +02:00
Michael Niedermayer
dc4a6e4d5a
avfilter/vf_libopencv: Make ocv_filter_entries const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 15:13:30 +02:00
Michael Niedermayer
536b42e858
avutil/cast5: Make iv array static
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 14:37:48 +02:00
Michael Niedermayer
156f64bdf1
avutil/cast5: Mark key_bits as const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 14:37:08 +02:00
Michael Niedermayer
dfc0708e23
avcodec/x86/dct-test: Use uint8_t for idct_simple_mmx_perm
...
The table contains no element outside the unsigned 8bit range
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 13:43:15 +02:00
Michael Niedermayer
270e647adc
avcodec/x86/dct-test: Make static table const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 13:42:46 +02:00
Michael Niedermayer
c187217287
avformat/matroskadec: Mark static tables as const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 13:27:45 +02:00
Rodger Combs
71b69df622
lavf/http: support HTTPS when listening
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 12:03:48 +02:00
Michael Niedermayer
6197672720
avcodec/svq3: Print unknown fields at debug level
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 02:58:00 +02:00
Michael Niedermayer
d56245f770
Merge remote-tracking branch 'rbultje/vp9-profile1-wip'
...
* rbultje/vp9-profile1-wip:
vp9: add fate test for 422.
vp9: copy bug in libvpx for 4:2:2 chroma bs=8x4/4x4 prediction.
vp9: add yuv440 fate test.
vp9: fix mask_edges and filter_plane_rows/cols() for 440.
vp9: more specifically specify mask destination to mask_edges().
vp9: add fate test for profile 1 444.
vp9: don't create special u/v filter masks for 444.
vp9: merge uv loopfilter code into generic filter_plane_rows/cols().
vp9: split out loopfilter luma rows/cols functions from loopfilter_sb().
vp9: invert order of two conditions.
vp9: use correct chroma subsampling for profile 1 inter block recon.
vp9: use correct chroma subsampling for profile 1 intra block recon.
vp9: take chroma subsampling into account when walking the block tree.
vp9: support non-420 chroma subsampling for profile 1 token decoding.
vp9: increase buffer sizes for non-420 chroma subsamplings.
vp9: profile 1 header decoding.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-01 22:23:48 +02:00
Michael Niedermayer
c8de8f7e64
Merge commit '3ecb82dd4110108244373f007710df4c2ae572b6'
...
* commit '3ecb82dd4110108244373f007710df4c2ae572b6':
dnxhddec: Fix pixel format change
See: dcac15a84c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-01 21:56:11 +02:00
Michael Niedermayer
9aff7d41f6
Merge commit '6503cbf842a026faec517eb980551089168c7d8a'
...
* commit '6503cbf842a026faec517eb980551089168c7d8a':
ffv1enc: Add const attribute to input frame
Conflicts:
libavcodec/ffv1.h
no change, the changed field does not exist in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-01 21:34:35 +02:00
Carl Eugen Hoyos
3ecb82dd41
dnxhddec: Fix pixel format change
...
Regression introduced in 598f7d046c
.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-05-01 14:52:24 +01:00
Vittorio Giovara
6503cbf842
ffv1enc: Add const attribute to input frame
...
warning: assigning to 'AVFrame *' (aka 'struct AVFrame *') from
'const AVFrame *' (aka 'const struct AVFrame *') discards
qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
2015-05-01 14:52:24 +01:00
Michael Niedermayer
c9ac9adb46
avcodec/h264: Remove failure on data partitioning
...
decode all NAL units instead
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-01 12:30:57 +02:00
Ronald S. Bultje
b005d09764
vp9: add fate test for 422.
...
Sample available at:
http://downloads.webmproject.org/test_data/libvpx/vp91-2-04-yuv422.webm
2015-05-01 08:45:55 +02:00
Ronald S. Bultje
6f63bdbae6
vp9: copy bug in libvpx for 4:2:2 chroma bs=8x4/4x4 prediction.
2015-05-01 08:45:55 +02:00
Ronald S. Bultje
7126c80f0d
vp9: add yuv440 fate test.
...
Sample available at:
http://downloads.webmproject.org/test_data/libvpx/vp91-2-04-yuv440.webm
2015-05-01 08:45:55 +02:00
Ronald S. Bultje
2a7d7bef62
vp9: fix mask_edges and filter_plane_rows/cols() for 440.
2015-05-01 08:45:54 +02:00
Ronald S. Bultje
cf62f2d2d6
vp9: more specifically specify mask destination to mask_edges().
2015-05-01 08:45:54 +02:00
Ronald S. Bultje
f052ea6ba5
vp9: add fate test for profile 1 444.
...
Sample available at:
http://downloads.webmproject.org/test_data/libvpx/vp91-2-04-yuv444.webm
2015-05-01 08:45:54 +02:00
Ronald S. Bultje
e4f77e6239
vp9: don't create special u/v filter masks for 444.
...
This fixes vp91-2-04-yuv444.webm.
2015-05-01 08:45:54 +02:00
Ronald S. Bultje
afa9d00b43
vp9: merge uv loopfilter code into generic filter_plane_rows/cols().
2015-05-01 08:45:53 +02:00
Ronald S. Bultje
ba59a5ec42
vp9: split out loopfilter luma rows/cols functions from loopfilter_sb().
2015-05-01 08:45:53 +02:00
Ronald S. Bultje
844799b033
vp9: invert order of two conditions.
...
This makes it equal to row-based loopfilter code, and also makes the
chroma/luma code identical.
2015-05-01 08:45:53 +02:00
Ronald S. Bultje
d382cc0fad
vp9: use correct chroma subsampling for profile 1 inter block recon.
2015-05-01 08:45:52 +02:00
Ronald S. Bultje
d2aa6f65db
vp9: use correct chroma subsampling for profile 1 intra block recon.
2015-05-01 08:45:52 +02:00
Ronald S. Bultje
ed3e0cc715
vp9: take chroma subsampling into account when walking the block tree.
2015-05-01 08:45:52 +02:00
Ronald S. Bultje
6019002f0f
vp9: support non-420 chroma subsampling for profile 1 token decoding.
2015-05-01 08:45:52 +02:00
Ronald S. Bultje
2d0bea4719
vp9: increase buffer sizes for non-420 chroma subsamplings.
2015-05-01 08:45:51 +02:00
Ronald S. Bultje
a03b057ede
vp9: profile 1 header decoding.
2015-05-01 08:45:51 +02:00
Shivraj Patil
02001ada5c
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for H264 lpf and weight/biweight functions
...
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-01 04:19:18 +02:00
Michael Niedermayer
3cd666cfbc
avcodec/svq3: Fix memleak of last_pic_for_ec
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-01 03:15:46 +02:00
Michael Niedermayer
e0153145f6
avformat/mpegts: Detect changes in packet through CRC instead of just the 5bit version
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-01 02:14:14 +02:00
Michael Niedermayer
4b6be54bed
avformat/mpegts: reset last_ver on corrupted packets
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-01 02:13:26 +02:00
Michael Niedermayer
4e8d01f20c
avformat/mpegts: Factorize version checking code out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-01 01:29:43 +02:00
Vignesh Venkatasubramanian
ccb8f67499
lavf/webm_chunk: Fix a memory leak.
...
Fix a duplicate memory allocation. priv_data should be allocated
in line 64 call to avformat_alloc_output_context2 since we pass
the correct AVFormat to it. This removes the duplicate allocation.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-30 23:33:10 +02:00
Ronald S. Bultje
5935513c0e
vp9: fix show-existing-frames for multi-threading.
...
This also fixes intra-only MT failures (it was the same bug), see trac
4526 and 4527.
Tested-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-30 23:32:09 +02:00
James Almer
39fbb27ec3
avutil/softfloat_tables: add missing stdint.h include
...
Fixes make checkheaders
Signed-off-by: James Almer <jamrial@gmail.com>
2015-04-30 17:38:41 -03:00
Michael Niedermayer
7ad528cf23
Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'
...
* commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e':
avplay: Do not print a possibly uninitialized value
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-30 22:23:29 +02:00
Michael Niedermayer
f5c5aa968c
Merge commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641'
...
* commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641':
xcbgrab: Validate the capture area
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-30 22:15:22 +02:00