OSDN Git Service
Michael Niedermayer [Thu, 7 Nov 2013 22:05:26 +0000 (23:05 +0100)]
Merge commit '
cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'
* commit '
cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
avfilter/graphparser: Directly free filter memory if initialization fails
Conflicts:
libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lenny Wang [Thu, 7 Nov 2013 21:15:49 +0000 (15:15 -0600)]
avfilter/unsharp: added optimized opencl kernels
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dave Yeo [Thu, 7 Nov 2013 19:10:20 +0000 (11:10 -0800)]
Fix compilation with os2threads
Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Nov 2013 17:39:23 +0000 (18:39 +0100)]
avformat/mpegvideodec: check seq headers more completely during probing
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 7 Nov 2013 19:28:44 +0000 (20:28 +0100)]
avformat/img2enc: simplify split planes extension selection.
Clément Bœsch [Sat, 19 Oct 2013 18:39:30 +0000 (20:39 +0200)]
doc/muxers: document animated GIF muxer.
Clément Bœsch [Sat, 19 Oct 2013 18:24:58 +0000 (20:24 +0200)]
avformat/gif: fix final_delay unit in documentation.
Clément Bœsch [Thu, 7 Nov 2013 19:22:25 +0000 (20:22 +0100)]
avformat/img2enc: reindent after previous commit.
Clément Bœsch [Sat, 19 Oct 2013 17:39:28 +0000 (19:39 +0200)]
avformat/image2: allow muxing gif files.
Fixes Ticket #2936.
Paul B Mahol [Thu, 7 Nov 2013 17:45:47 +0000 (17:45 +0000)]
avfilter/af_aecho: free input frame after it is being used
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 7 Nov 2013 14:55:35 +0000 (14:55 +0000)]
avcodec/libfdk-aacdec: remove redundant log messages
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 7 Nov 2013 14:04:21 +0000 (14:04 +0000)]
avcodec/hnm4video: remove redundant log message
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 6 Nov 2013 12:12:59 +0000 (13:12 +0100)]
avformat/astdec: sanity check channels & sample rate
Fixes probetest failure
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
kowalsky [Wed, 6 Nov 2013 20:01:57 +0000 (21:01 +0100)]
avformat/hls: fixed bug where custom http headers weren't kept for hls streams
See: https://trac.ffmpeg.org/ticket/3024
Michael Niedermayer [Wed, 6 Nov 2013 21:59:16 +0000 (22:59 +0100)]
avfilter/af_aresample: Calculate output buffer size more precisely.
Fixes accumulation of data in case of significant silence injections
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 6 Nov 2013 21:06:15 +0000 (22:06 +0100)]
avfilter/graphparser: Directly free filter memory if initialization fails
Michael Niedermayer [Wed, 6 Nov 2013 11:56:42 +0000 (12:56 +0100)]
avformat/segafilm: check 2nd tag
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Nov 2013 11:44:02 +0000 (12:44 +0100)]
avformat/swfdec: check version and size during probing
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Nov 2013 10:51:16 +0000 (11:51 +0100)]
avformat/rsd: increase probe score, as misdetections are fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Nov 2013 10:48:49 +0000 (11:48 +0100)]
avformat/rsd: Check channels and sample_rate fields
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Nov 2013 10:33:12 +0000 (11:33 +0100)]
avformat/libgme: decrease score by 1, fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Nov 2013 09:58:58 +0000 (10:58 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: add smarter method for determining video picture duration
ffplay: add frame duration estimated from frame rate to VideoPicture
ffplay: avoid code duplication in AVFILTER enabled and disabled case
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Nov 2013 10:49:09 +0000 (11:49 +0100)]
avutil/common: error out with clear message if __STDC_CONSTANT_MACROS is not defined with c++
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Nov 2013 20:58:26 +0000 (21:58 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Move -Wno-maybe-uninitialized check into gcc section
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sat, 2 Feb 2013 11:37:29 +0000 (12:37 +0100)]
ffplay: add smarter method for determining video picture duration
- consider it an invalid PTS when the next PTS value is the same as the current one
- in case of invalid or unknown PTS, return vp->duration
This fixes ffplay part of ticket #3005.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 27 Oct 2013 14:55:42 +0000 (15:55 +0100)]
ffplay: add frame duration estimated from frame rate to VideoPicture
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 27 Oct 2013 14:51:41 +0000 (15:51 +0100)]
ffplay: avoid code duplication in AVFILTER enabled and disabled case
Signed-off-by: Marton Balint <cus@passwd.hu>
Clément Bœsch [Sun, 3 Nov 2013 17:17:36 +0000 (18:17 +0100)]
avcodec/vp9: add ff_vp9_idct_idct_{4x4,8x8}_ssse3().
1789 decicycles in idct_idct_4x4_add_c, 262136 runs, 8 skips
1839 decicycles in idct_idct_4x4_add_c, 524270 runs, 18 skips
1864 decicycles in idct_idct_4x4_add_c,
1048548 runs, 28 skips
529 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 262138 runs, 6 skips
516 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 524282 runs, 6 skips
474 decicycles in ff_vp9_idct_idct_4x4_add_ssse3,
1048565 runs, 11 skips
(~3.9x faster)
7726 decicycles in idct_idct_8x8_add_c,
1048433 runs, 143 skips
7732 decicycles in idct_idct_8x8_add_c,
2096882 runs, 270 skips
7731 decicycles in idct_idct_8x8_add_c,
4193772 runs, 532 skips
1145 decicycles in ff_vp9_idct_idct_8x8_add_ssse3,
1048549 runs, 27 skips
1137 decicycles in ff_vp9_idct_idct_8x8_add_ssse3,
2097097 runs, 55 skips
1086 decicycles in ff_vp9_idct_idct_8x8_add_ssse3,
4194188 runs, 116 skips
(~7.1x faster)
Overall decode time before commit:
16.48s user 0.03s system 99% cpu 16.526 total
16.54s user 0.01s system 99% cpu 16.566 total
16.46s user 0.03s system 99% cpu 16.511 total
Overall decode time after commit:
16.34s user 0.02s system 99% cpu 16.378 total
16.28s user 0.02s system 99% cpu 16.315 total
16.32s user 0.03s system 99% cpu 16.366 total
Tested on i7 920 with 40s 1080p footage.
Lenny Wang [Mon, 4 Nov 2013 03:58:09 +0000 (21:58 -0600)]
avfilter/opencl: compile kernels separately
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lenny Wang [Mon, 4 Nov 2013 03:58:09 +0000 (21:58 -0600)]
avutil/opencl: compile kernels separately
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 5 Nov 2013 13:10:07 +0000 (13:10 +0000)]
avcodec/mss2: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 5 Nov 2013 12:56:59 +0000 (12:56 +0000)]
avcodec/flashsv: use av_freep() for tmpblock
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 5 Nov 2013 12:50:43 +0000 (12:50 +0000)]
avcodec/mss1: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Stefano Sabatini [Mon, 4 Nov 2013 23:01:59 +0000 (00:01 +0100)]
lsws/utils: introduce scale_algorithms array
Allow some dumb factorizations, slightly decrease spaghetti factor.
Paul B Mahol [Tue, 5 Nov 2013 12:44:52 +0000 (12:44 +0000)]
avcodec/flashsv: fix typo
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 5 Nov 2013 12:44:20 +0000 (12:44 +0000)]
avcodec/tscc2: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 5 Nov 2013 12:37:52 +0000 (12:37 +0000)]
avcodec/brender_pix: stop calling av_image_check_size() twice
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 5 Nov 2013 12:36:24 +0000 (12:36 +0000)]
avcodec/flashsv: stop using deprecated avcodec_set_dimensions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 5 Nov 2013 12:31:18 +0000 (12:31 +0000)]
avcodec/flashsv: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 5 Nov 2013 12:26:58 +0000 (12:26 +0000)]
avcodec/brender_pix: stop using deprecated avcodec_set_dimensions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 5 Nov 2013 12:24:39 +0000 (12:24 +0000)]
avcodec/c93: stop using deprecated avcodec_set_dimensions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diego Biurrun [Sat, 2 Nov 2013 11:16:00 +0000 (12:16 +0100)]
configure: Move -Wno-maybe-uninitialized check into gcc section
As another example of bizarre compiler behavior clang groks the
-Wmaybe-uninitialized option, but not -Wno-maybe-uninitialized
and spews a warning for every file that gets compiled.
Michael Niedermayer [Tue, 5 Nov 2013 11:17:35 +0000 (12:17 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer
Conflicts:
libavfilter/buffer.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Nov 2013 11:13:36 +0000 (12:13 +0100)]
Merge commit '
82c86d0b1839b01b3cd0dd848fb6416ff21506dd'
* commit '
82c86d0b1839b01b3cd0dd848fb6416ff21506dd':
graph2dot: Add missing #include for av_get_channel_layout_string()
See:
1acd2f6ba7bc85d4aab6f0ebdc56c8d21785640e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Nov 2013 11:04:39 +0000 (12:04 +0100)]
Michael Niedermayer [Tue, 5 Nov 2013 09:32:10 +0000 (10:32 +0100)]
Merge commit '
70cbf33405f50dfaf77e85f382a188acf17dc71a'
* commit '
70cbf33405f50dfaf77e85f382a188acf17dc71a':
vdpau: Add missing #includes to fix standalone header compilation
Conflicts:
libavcodec/vdpau_internal.h
Not completely merged as this would break use of vdpau.h from C++
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Nov 2013 09:25:53 +0000 (10:25 +0100)]
Merge commit '
e2b5b097898c9155f4bdff4d83cdc54d5eef6930'
* commit '
e2b5b097898c9155f4bdff4d83cdc54d5eef6930':
x86: rv40dsp: Use PAVGB instruction macro where appropriate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 14:59:19 +0000 (15:59 +0100)]
avformat/http: print http headers at AV_LOG_DEBUG level
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 4 Nov 2013 22:42:44 +0000 (23:42 +0100)]
lsws/utils: fix typo
Stefano Sabatini [Mon, 4 Nov 2013 12:03:56 +0000 (13:03 +0100)]
lavfi/ladspa: cast return value of av_x_if_null to char*, fix warnings
Diego Biurrun [Mon, 4 Nov 2013 11:53:07 +0000 (12:53 +0100)]
avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer
The function is used in a block of code that is deprecated anyway.
Diego Biurrun [Mon, 4 Nov 2013 21:33:16 +0000 (22:33 +0100)]
graph2dot: Add missing #include for av_get_channel_layout_string()
Diego Biurrun [Mon, 4 Nov 2013 16:35:38 +0000 (17:35 +0100)]
graph2dot: Fix use of deprecated API
Diego Biurrun [Mon, 4 Nov 2013 17:16:46 +0000 (18:16 +0100)]
vdpau: Add missing #includes to fix standalone header compilation
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Mon, 4 Nov 2013 21:19:51 +0000 (22:19 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
omadec: loosen format probing constraints
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 21:02:02 +0000 (22:02 +0100)]
Merge commit '
1c736bedd9891501960ebac0f7c05eb60225e947'
* commit '
1c736bedd9891501960ebac0f7c05eb60225e947':
omadec: check GEOB sizes against buffer size
Conflicts:
libavformat/omadec.c
See:
e74fa25cb9f29aee8a36df0c8e492f8bafdbe4a0
See:
91e72e35141f590c38985ad0ae3453a4e9e86b8a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 20:59:21 +0000 (21:59 +0100)]
Merge commit '
97f50e92b5cf3b47a76f75d76ed4340e822030db'
* commit '
97f50e92b5cf3b47a76f75d76ed4340e822030db':
omadec: Fix wrong number of array elements
See:
4f5d1468f55eb87bce84845c4e62242c791268f5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 20:52:46 +0000 (21:52 +0100)]
Merge commit '
e73996954d8e00117056dcefb38ef3d4d2f37967'
* commit '
e73996954d8e00117056dcefb38ef3d4d2f37967':
filtfmts-test: Fix use of deprecated API
Conflicts:
libavfilter/filtfmts.c
See:
f12174c8cef872030a156cbf252f4951c3a6357c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 20:43:07 +0000 (21:43 +0100)]
Merge commit '
3ef9b7ab95cc703b67a8b658dca45c80df0aaa66'
* commit '
3ef9b7ab95cc703b67a8b658dca45c80df0aaa66':
hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 20:37:18 +0000 (21:37 +0100)]
Merge commit '
885ec9242554ad25922258a595ec5e317922a412'
* commit '
885ec9242554ad25922258a595ec5e317922a412':
hevc: Use parsed VUI colorimetry in avcodec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 20:25:36 +0000 (21:25 +0100)]
Merge commit '
cd8f772d0678a90957f4dfd5ce51af9d22e3f212'
* commit '
cd8f772d0678a90957f4dfd5ce51af9d22e3f212':
lavc: Add colorimetry values for BT.2020, other non-included ones
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 20:01:58 +0000 (21:01 +0100)]
Merge commit '
446e37dc97e533e37f6aa0a11355124207e3a7f7'
* commit '
446e37dc97e533e37f6aa0a11355124207e3a7f7':
vf_fieldorder: remove superfluous get_video_buffer
Conflicts:
libavfilter/vf_fieldorder.c
See:
9b35bee696739eb6774bdba30504c51132e2a934
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 3 Nov 2013 20:28:45 +0000 (21:28 +0100)]
x86: rv40dsp: Use PAVGB instruction macro where appropriate
David Goldwich [Thu, 24 Oct 2013 13:24:26 +0000 (15:24 +0200)]
omadec: loosen format probing constraints
Imporoves detection of some files in the wild:
- ID3v2 a.k.a. "ea3" header is optional.
- Version and flags in ID3v2 header are unspecified.
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Thu, 24 Oct 2013 13:24:25 +0000 (15:24 +0200)]
omadec: check GEOB sizes against buffer size
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Thu, 24 Oct 2013 13:24:24 +0000 (15:24 +0200)]
omadec: Fix wrong number of array elements
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diego Biurrun [Mon, 4 Nov 2013 13:56:28 +0000 (13:56 +0000)]
filtfmts-test: Fix use of deprecated API
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Yusuke Nakamura [Sun, 3 Nov 2013 18:47:31 +0000 (18:47 +0000)]
hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Jan Ekström [Sun, 3 Nov 2013 19:45:02 +0000 (19:45 +0000)]
hevc: Use parsed VUI colorimetry in avcodec
Also limit the parsed VUI values to known valid ones.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Jan Ekström [Mon, 4 Nov 2013 10:28:39 +0000 (10:28 +0000)]
lavc: Add colorimetry values for BT.2020, other non-included ones
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Fri, 1 Nov 2013 00:51:14 +0000 (01:51 +0100)]
avutil: add av_fopen_utf8()
fopen() on windows uses UTF-16, we use UTF-8 everywhere, this
function bridges the gap by using avpriv_open()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 13:18:09 +0000 (14:18 +0100)]
avfilter/vf_scale: add ov/hsub
Suggested-by: divVerent
Reviewed-by: Stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 4 Nov 2013 13:37:06 +0000 (14:37 +0100)]
vf_fieldorder: remove superfluous get_video_buffer
Clément Bœsch [Mon, 4 Nov 2013 11:35:17 +0000 (12:35 +0100)]
doc/examples: rename demuxing to demuxing_decoding.
That example shows how the decoding process works, not only the
demuxing.
Clément Bœsch [Wed, 30 Oct 2013 14:50:36 +0000 (15:50 +0100)]
doc/examples/demuxing: show how to use the reference counting system.
Michael Niedermayer [Mon, 4 Nov 2013 10:50:47 +0000 (11:50 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacdec: Set the profile during decoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 10:41:55 +0000 (11:41 +0100)]
Merge commit '
da6506c607eda585ba4b15430cf3c9a2ce09c3a9'
* commit '
da6506c607eda585ba4b15430cf3c9a2ce09c3a9':
lavc: move AVCodecContext.pkt to AVCodecInternal
Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 10:14:38 +0000 (11:14 +0100)]
Merge commit '
38ecc3702dabbea09230f6d6333f59e74f5d1c12'
* commit '
38ecc3702dabbea09230f6d6333f59e74f5d1c12':
pthread: store thread contexts in AVCodecInternal instead of AVCodecContext
Conflicts:
libavcodec/internal.h
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 10:05:52 +0000 (11:05 +0100)]
Merge commit '
daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'
* commit '
daa7a1d4431b6acf1f93c4a98b3de123abf4ca18':
pthread_slice: rename ThreadContext -> SliceThreadContext
Conflicts:
libavcodec/pthread_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 09:44:34 +0000 (10:44 +0100)]
Merge commit '
cc14ee03a7b91c69343f8d60c9e089a1950eeadb'
* commit '
cc14ee03a7b91c69343f8d60c9e089a1950eeadb':
lavc: split slice and frame threading functions into separate files
Conflicts:
libavcodec/Makefile
libavcodec/pthread.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 08:54:42 +0000 (09:54 +0100)]
Merge commit '
5cd6513f5be14b9744783d3d9e853d3f11065e93'
* commit '
5cd6513f5be14b9744783d3d9e853d3f11065e93':
pthread: drop avcodec_ prefixes from static functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 08:48:11 +0000 (09:48 +0100)]
Merge commit '
694d997afe07ec619e61e1c614733796dd01a52b'
* commit '
694d997afe07ec619e61e1c614733796dd01a52b':
x86: hpeldsp: Use PAVGB instruction macro where necessary
See:
074155360d28d25701e0cbc7e867bda0e08d9428
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Gian-Carlo Pascutto [Sun, 3 Nov 2013 10:42:47 +0000 (12:42 +0200)]
aacdec: Set the profile during decoding
Previously the profile would not be set if the bitstream needs
to be decoded to know the profile.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sun, 27 Oct 2013 12:12:53 +0000 (13:12 +0100)]
lavc: move AVCodecContext.pkt to AVCodecInternal
It's a private field, not meant to be accessed from outside lavc.
Anton Khirnov [Sun, 27 Oct 2013 12:00:37 +0000 (13:00 +0100)]
pthread: store thread contexts in AVCodecInternal instead of AVCodecContext
It's a private field, it should not be visible to callers.
Deprecate AVCodecContext.thread_opaque
Anton Khirnov [Sun, 27 Oct 2013 11:31:38 +0000 (12:31 +0100)]
pthread_slice: rename ThreadContext -> SliceThreadContext
This should prevent confusion with frame threading.
Anton Khirnov [Sun, 27 Oct 2013 11:22:52 +0000 (12:22 +0100)]
lavc: split slice and frame threading functions into separate files
Anton Khirnov [Sun, 27 Oct 2013 11:03:05 +0000 (12:03 +0100)]
pthread: drop avcodec_ prefixes from static functions
Ronald S. Bultje [Mon, 4 Nov 2013 00:42:30 +0000 (19:42 -0500)]
Put vp9_scans and vp9_scans_nb in ro_data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Nov 2013 01:08:43 +0000 (02:08 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/pulse: add ff_ prefix and fix param type
lavd/pulse_audio_enc: fix flush return code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mikulas Patocka [Sun, 3 Nov 2013 19:37:11 +0000 (20:37 +0100)]
x86: hpeldsp: Use PAVGB instruction macro where necessary
Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Mon, 4 Nov 2013 00:20:46 +0000 (01:20 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Remove redundant OBJS declaration intended for programs
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sun, 3 Nov 2013 23:34:18 +0000 (00:34 +0100)]
lavd/pulse: add ff_ prefix and fix param type
Add ff_ prefix for internal API function.
Change type of param from int into enum AVCodecID as it is more specific.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Fri, 1 Nov 2013 14:10:56 +0000 (15:10 +0100)]
lavd/pulse_audio_enc: fix flush return code
Successful flushing is reported by returning 1 instead of 0.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
wm4 [Sun, 3 Nov 2013 17:17:45 +0000 (18:17 +0100)]
http: add hack to make streams served by MediaGateway not seekable
These streams are reported as seekable, but all tests show they are not,
and the server merely pretends the streams are seekable. The server
responds with:
content-range: bytes 0-
1999999999/
2000000000
Range requests seem to be correctly answered, but the actual data
returned at the same offset is different. Assume this is a bug in the
server software. The server identifies itself as:
Server: MediaGateway 3.5.2-001
Add a hack that checks the server name, and disables seeking in this
case.
Test URL: http://8283.live.streamtheworld.com:80/CBC_R1_VCR_H_SC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 21:11:11 +0000 (22:11 +0100)]
avcodec/ffv1enc: Check high bpp RGB against coder type too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Nov 2013 20:26:40 +0000 (21:26 +0100)]
avformat/utils: never decrease has_b_frames in compute_pkt_fields()
The intent of the original check was to increase has_b_frames when
it was incorrectly set to 0. Later codecs allowed larger values
Found-by: divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mikulas Patocka [Sun, 3 Nov 2013 17:00:17 +0000 (18:00 +0100)]
avcodec/x86/hpeldsp: fix crash on AMD K6-3+
There are instructions pavgb and pavgusb. Both instructions do the same
operation but they have different enconding. Pavgb exists in SSE (or
MMXEXT) instruction set and pavgusb exists in 3D-NOW instruction set.
livavcodec uses the macro PAVGB to select the proper instruction. However,
the function avg_pixels8_xy2 doesn't use this macro, it uses pavgb
directly.
As a consequence, the function avg_pixels8_xy2 crashes on AMD K6-2 and
K6-3 processors, because they have pavgusb, but not pavgb.
This bug seems to be introduced by commit
71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46, "dsputil: x86: Convert mpeg4
qpel and dsputil avg to yasm"
Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 2 Nov 2013 14:53:43 +0000 (15:53 +0100)]
build: Remove redundant OBJS declaration intended for programs
Stefano Sabatini [Sun, 3 Nov 2013 09:50:16 +0000 (10:50 +0100)]
ffmpeg: add verbose consistency checks in case of filtering inconsistent options
In particular, warn in case -filter and streamcopy is used at the same
time, fix trac ticket #678.