Michael Niedermayer
bcbd7dbce5
Merge commit ' 68a06b3a63'
...
* commit '68a06b3a63 ':
aarch64: use '#' for whole line asm comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 18:13:43 +02:00
Michael Niedermayer
40285d2659
Merge commit ' 6a0fa4d86f'
...
* commit '6a0fa4d86f ':
aarch64: remove optional :pg_hi21: for adrp instruction
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 18:03:19 +02:00
Michael Niedermayer
ab9afcdf04
Merge commit ' fd2981ea92'
...
* commit 'fd2981ea92 ':
aarch64: add darwin style PAGE/PAGEOFF relocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 18:02:42 +02:00
Michael Niedermayer
a4ed51ab40
avcodec/vp3: free tables before allocating new ones
...
Fixes memleak on seeking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 17:09:17 +02:00
Michael Niedermayer
90b26d63ba
avcodec/vp3: factorize out free_tables()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 17:08:32 +02:00
Michael Niedermayer
576654302b
ffmpeg: use av_log_ask_for_sample() instead of duplicating avpriv_request_sample()
2014-06-03 16:05:37 +02:00
Michael Niedermayer
2422a7ffe4
Loose mplayer in MPlayer/incoming/
...
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 16:03:44 +02:00
Michael Niedermayer
3e7b4b9fbd
Add direct link to ML in missing_feature_sample()
...
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 15:58:27 +02:00
Michael Niedermayer
768ef0f19e
ffmpeg: request sample if the decoder & demuxer has_b_frames mismatch
...
We cannot use avpriv_request_sample() as this is private to the libs
or rather it would be a bad usage example
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 15:24:00 +02:00
Michael Niedermayer
a0b2de77ed
ffmpeg: remove "has_b_frames" backpassing
...
It seems working without this now for the files i tested it with, if this causes
a regression, dont hesitate to put the line back or open a ticket or fix (if possible)
the parser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 15:23:43 +02:00
Michael Niedermayer
72e4ceeb79
avformat/asfdec: Use a parser for mpeg4-asp to find has_b_frames
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 15:23:30 +02:00
Janne Grunau
68a06b3a63
aarch64: use '#' for whole line asm comments
...
Both gnu as and clang treat lines starting with '#' as comments if they
aren't consumed by the C-style preprocessor.
Using '//' does not work with clang since comments are removed before
macro expansion.
2014-06-03 14:23:02 +02:00
Janne Grunau
6a0fa4d86f
aarch64: remove optional :pg_hi21: for adrp instruction
...
Clang's integrated assembler does not support it.
2014-06-03 14:23:02 +02:00
Janne Grunau
fd2981ea92
aarch64: add darwin style PAGE/PAGEOFF relocations
2014-06-03 14:23:01 +02:00
Carl Eugen Hoyos
ad7de82218
Fix fate-opus and fate-aac-ln-encode with --target-path.
2014-06-03 10:43:14 +02:00
Michael Niedermayer
4e3fe65610
avcodec/utils/ff_init_buffer_info: Favor color information from AVFrame if available
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 05:13:51 +02:00
Carl Eugen Hoyos
763e714442
Do not limit blocksize when reading PCM from aiff.
...
Fixes ticket #3695 .
2014-06-03 03:07:55 +02:00
Lou Logan
c17973f19a
doc/bsf: document noise bitstream filter
...
Partially addresses ticket #3198 .
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-06-02 15:17:24 -08:00
Michael Niedermayer
1a426d5404
avformat/utils/avformat_find_stream_info: Move max_analyze_duration setup out of the packet loop
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 21:21:11 +02:00
Michael Niedermayer
2addbeef8b
bfin: add README
...
Based on sh4/README
Suggested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 20:18:44 +02:00
Michael Niedermayer
b55d3bbeed
Merge commit ' 880e2aa236'
...
* commit '880e2aa236 ':
Remove all Blackfin architecture optimizations
Conflicts:
libavcodec/bfin/dsputil.S
libavcodec/bfin/dsputil_init.c
libavcodec/bfin/fdct_bfin.S
libavcodec/bfin/hpel_pixels_no_rnd.S
libavcodec/bfin/hpeldsp_init.c
libavcodec/bfin/idct_bfin.S
libavcodec/bfin/mathops.h
libavcodec/bfin/pixels.S
libavcodec/bfin/pixels.h
libavcodec/bfin/vp3dsp.S
libavcodec/bfin/vp3dsp_init.c
libavutil/bfin/asm.h
libavutil/bfin/attributes.h
libswscale/bfin/internal_bfin.S
libswscale/bfin/swscale_bfin.c
libswscale/bfin/yuv2rgb_bfin.c
libswscale/swscale_internal.h
libswscale/version.h
If someone wants to maintain blackfin support in FFmpeg, please contact
ffmpeg-devel@ffmpeg.org
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 19:38:01 +02:00
Michael Niedermayer
fa4e17c140
Merge commit ' b88cc5cca1'
...
* commit 'b88cc5cca1 ':
bink: Rename BinkDSPContext member so as not to clash with BlockDSPContext
Conflicts:
libavcodec/bink.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 19:28:54 +02:00
Michael Niedermayer
666e29fe9e
avutil/mathematics/av_add_stable: Avoid av_cmp_q() call
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 19:06:39 +02:00
Michael Niedermayer
e9add0d85b
av_add_stable: Add fast special case where step can be represented exactly
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 19:00:18 +02:00
Michael Niedermayer
4956d0e5a6
avutil/mathematics/av_add_stable: check for the common case of inc=1
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 18:02:27 +02:00
Michael Niedermayer
5b7519fbaa
avutil/mathematics/av_add_stable: avoid unneeded variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 18:00:34 +02:00
Diego Biurrun
880e2aa236
Remove all Blackfin architecture optimizations
...
Blackfin is a painful platform to work with, no test machines are available
and the range of multimedia applications is dubious. Thus it only represents
a maintenance burden.
2014-06-02 08:41:47 -07:00
Michael Niedermayer
6f6edfe1c0
avformat/utils: Call ff_rfps_add_frame() only for video
...
This avoids some unneeded computations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 17:09:53 +02:00
Ronald S. Bultje
cdfd9717ed
swr: move compensation_distance handling to swri_resample caller.
...
I think there's an off-by-one in terms of the switchpoint where we
switch from dst_incr to ideal_dst_incr, I don't think that's a massive
issue, but just be aware of that. It's probably trivial to prevent but
I don't care.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
I could not reproduce any off by 1 error, results are bit exact (michael)
2014-06-02 15:06:24 +02:00
Michael Niedermayer
bfb3ed1a9d
avformat/mux: Dont leave stale side data pointers in ff_interleave_add_packet()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 14:48:22 +02:00
Michael Niedermayer
74ece44373
avformat/mux: fix memleak of side data in flac fate tests
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 14:38:03 +02:00
Michael Niedermayer
bf0e5ac9cc
fate: fate-hevc-conformance-INITQP_B_Sony_1 belongs to the 10bit kind
...
Fixes the test on big endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 13:11:42 +02:00
Diego Biurrun
b88cc5cca1
bink: Rename BinkDSPContext member so as not to clash with BlockDSPContext
2014-06-02 03:41:56 -07:00
Carl Eugen Hoyos
f284e85714
Report "unknown codec" instead of "unspecifed size" if the codec is unknown.
2014-06-02 08:33:40 +02:00
Timothy Gu
22d1b24982
tests: Replace fieldmatch test with pixfmt
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 04:12:10 +02:00
Michael Niedermayer
44a7299139
fate: add simple test for async
...
This only checks that things havnt changed, the values provide little
help in determining if a change is good or bad.
Improvements welcome!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 02:04:45 +02:00
Michael Niedermayer
2c23f87c85
swr/resample_template: prevent end_index from overflowing and add check for delta_frac overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 00:57:08 +02:00
Ronald S. Bultje
9b53853756
Rewrite main resampling loop (common and linear).
...
This removes a branch at a performance-sensitive point (in the middle
of the loop). In fate-swr-resample-s32p-8000-2626, this makes the code
about 10% faster. It also simplifies the loops, allowing us to rewrite
it in yasm at some later point.
The compensation_distance != 0 code and index < 0 code are still kind
of hairy. For compensation_distance != 0, this should likely be handled
in the caller, so that it calls swri_resample twice (once until the
dst_incr switch-point, and once with the remainder of the samples). For
index < 0, the code should probably be rewritten to break out of the
loop once sample_index >= 0, and then resume (e.g. as a tail-call) to
the common or linear resampling loops.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 00:47:54 +02:00
Michael Niedermayer
e91f27cbbb
Merge commit ' 59cb5747ec'
...
* commit '59cb5747ec ':
rtmpproto: read metadata to set correct FLV header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 00:32:30 +02:00
Michael Niedermayer
6b9cbc9a11
Merge commit ' 3b18857ab3'
...
* commit '3b18857ab3 ':
rtmppkt: Add method to read an AMF string that is not prefixed by its type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 23:56:22 +02:00
Michael Niedermayer
8225bf95bc
Merge commit ' a1859032e3'
...
* commit 'a1859032e3 ':
flvdec: Do not default to a video and audio stream
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 23:51:41 +02:00
Christophe Gisquet
dcd2a6ca36
x86: hevc_mc: remove unneeded shift
...
The immediate value may be 0.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 23:34:33 +02:00
Christophe Gisquet
09fc28aed1
x86: hevcdsp_init: fix macro usage
...
The macro was not using the parameter but unconditionally using sse4.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 23:20:07 +02:00
Uwe L. Korn
59cb5747ec
rtmpproto: read metadata to set correct FLV header
...
In the presence of no metadata, do not set any stream flag in the FLV
header but let the demuxer handle the detection and creation of streams
as data arrives.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-06-01 23:30:48 +03:00
Uwe L. Korn
3b18857ab3
rtmppkt: Add method to read an AMF string that is not prefixed by its type
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-06-01 23:30:33 +03:00
Uwe L. Korn
a1859032e3
flvdec: Do not default to a video and audio stream
...
If no streams were indicated in the FLV header, do not automatically
allocate by default a video and an audio stream. Instead, in the case
that the header did not indicate the presence of any data, allocate no
stream until data actually arrives for one type.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-06-01 23:29:40 +03:00
Michael Niedermayer
8b686c886c
avcodec/options: use av_opt_copy() in avcodec_copy_context() to copy priv_data
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 20:50:08 +02:00
Michael Niedermayer
00759d71a2
avutil/opt: add av_opt_copy()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 20:49:18 +02:00
Michael Niedermayer
f028b7af7b
avutil/opt: add opt_size()
...
If people want, this could be exported as av_opt_size()
2014-06-01 20:47:50 +02:00
Michael Niedermayer
c4d88311cd
avcodec/dpx_parser: fix off by 1 error
...
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 20:14:49 +02:00