aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '896a5bff64264f4d01ed98eacc97a67260c1e17e'Michael Niedermayer2014-06-033-15/+28
|\ | | | | | | | | | | | | | | | | | | | | * commit '896a5bff64264f4d01ed98eacc97a67260c1e17e': arm: check if AS supports .dn Conflicts: configure libavcodec/arm/vc1dsp_init_neon.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: check if AS supports .dnJanne Grunau2014-06-033-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | Move the GNU as check before the arch specific asm checks since the .dn check requires gas compatible assembler. Disable the VC-1 motion compensation NEON asm which is the only part using that directive. The integrated assembler in the upcoming clang 3.5 does not support .dn/.qn without plans to change that. Too much effort to implement it while it is rarely used. http://llvm.org/bugs/show_bug.cgi?id=18199.
* | Merge commit '68a06b3a639ee21c78532ee4c50c3366bf890ff7'Michael Niedermayer2014-06-031-1/+1
|\| | | | | | | | | | | | | * commit '68a06b3a639ee21c78532ee4c50c3366bf890ff7': aarch64: use '#' for whole line asm comments Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: use '#' for whole line asm commentsJanne Grunau2014-06-031-1/+1
| | | | | | | | | | | | | | 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.
* | Merge commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617'Michael Niedermayer2014-06-031-1/+1
|\| | | | | | | | | | | | | * commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617': aarch64: remove optional :pg_hi21: for adrp instruction Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: remove optional :pg_hi21: for adrp instructionJanne Grunau2014-06-031-1/+1
| | | | | | | | Clang's integrated assembler does not support it.
* | Merge commit 'fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e'Michael Niedermayer2014-06-031-1/+4
|\| | | | | | | | | | | | | * commit 'fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e': aarch64: add darwin style PAGE/PAGEOFF relocations Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: add darwin style PAGE/PAGEOFF relocationsJanne Grunau2014-06-031-1/+4
| |
* | avcodec/vp3: free tables before allocating new onesMichael Niedermayer2014-06-031-0/+2
| | | | | | | | | | | | Fixes memleak on seeking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vp3: factorize out free_tables()Michael Niedermayer2014-06-031-8/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use av_log_ask_for_sample() instead of duplicating ↵Michael Niedermayer2014-06-031-4/+1
| | | | | | | | avpriv_request_sample()
* | Loose mplayer in MPlayer/incoming/Michael Niedermayer2014-06-033-3/+3
| | | | | | | | | | Found-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add direct link to ML in missing_feature_sample()Michael Niedermayer2014-06-033-3/+3
| | | | | | | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: request sample if the decoder & demuxer has_b_frames mismatchMichael Niedermayer2014-06-031-0/+6
| | | | | | | | | | | | | | 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>
* | ffmpeg: remove "has_b_frames" backpassingMichael Niedermayer2014-06-031-1/+4
| | | | | | | | | | | | | | | | 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>
* | avformat/asfdec: Use a parser for mpeg4-asp to find has_b_framesMichael Niedermayer2014-06-031-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix fate-opus and fate-aac-ln-encode with --target-path.Carl Eugen Hoyos2014-06-032-2/+2
| |
* | avcodec/utils/ff_init_buffer_info: Favor color information from AVFrame if ↵Michael Niedermayer2014-06-031-3/+6
| | | | | | | | | | | | available Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not limit blocksize when reading PCM from aiff.Carl Eugen Hoyos2014-06-031-2/+8
| | | | | | | | Fixes ticket #3695.
* | doc/bsf: document noise bitstream filterLou Logan2014-06-021-0/+7
| | | | | | | | | | | | | | Partially addresses ticket #3198. Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Timothy Gu <timothygu99@gmail.com>
* | avformat/utils/avformat_find_stream_info: Move max_analyze_duration setup ↵Michael Niedermayer2014-06-021-8/+8
| | | | | | | | | | | | out of the packet loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bfin: add READMEMichael Niedermayer2014-06-021-0/+6
| | | | | | | | | | | | Based on sh4/README Suggested-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73'Michael Niedermayer2014-06-0230-3084/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73': 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>
| * Remove all Blackfin architecture optimizationsDiego Biurrun2014-06-0230-3079/+5
| | | | | | | | | | | | 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.
* | Merge commit 'b88cc5cca111132b42c2ee99662bfefe7652e3da'Michael Niedermayer2014-06-021-10/+10
|\| | | | | | | | | | | | | | | | | | | * commit 'b88cc5cca111132b42c2ee99662bfefe7652e3da': bink: Rename BinkDSPContext member so as not to clash with BlockDSPContext Conflicts: libavcodec/bink.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bink: Rename BinkDSPContext member so as not to clash with BlockDSPContextDiego Biurrun2014-06-021-10/+10
| |
* | avutil/mathematics/av_add_stable: Avoid av_cmp_q() callMichael Niedermayer2014-06-021-4/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_add_stable: Add fast special case where step can be represented exactlyMichael Niedermayer2014-06-021-0/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/mathematics/av_add_stable: check for the common case of inc=1Michael Niedermayer2014-06-021-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/mathematics/av_add_stable: avoid unneeded variableMichael Niedermayer2014-06-021-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Call ff_rfps_add_frame() only for videoMichael Niedermayer2014-06-021-1/+2
| | | | | | | | | | | | This avoids some unneeded computations Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: move compensation_distance handling to swri_resample caller.Ronald S. Bultje2014-06-022-16/+12
| | | | | | | | | | | | | | | | | | | | | | 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)
* | avformat/mux: Dont leave stale side data pointers in ff_interleave_add_packet()Michael Niedermayer2014-06-021-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mux: fix memleak of side data in flac fate testsMichael Niedermayer2014-06-021-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: fate-hevc-conformance-INITQP_B_Sony_1 belongs to the 10bit kindMichael Niedermayer2014-06-021-1/+1
| | | | | | | | | | | | Fixes the test on big endian Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Report "unknown codec" instead of "unspecifed size" if the codec is unknown.Carl Eugen Hoyos2014-06-021-2/+3
| |
* | tests: Replace fieldmatch test with pixfmtTimothy Gu2014-06-023-66/+8
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: add simple test for asyncMichael Niedermayer2014-06-021-0/+27
| | | | | | | | | | | | | | | | | | 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>
* | swr/resample_template: prevent end_index from overflowing and add check for ↵Michael Niedermayer2014-06-021-2/+4
| | | | | | | | | | | | delta_frac overflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Rewrite main resampling loop (common and linear).Ronald S. Bultje2014-06-021-16/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '59cb5747ec3c5cd842b94e574c37889521c97cc4'Michael Niedermayer2014-06-021-1/+65
|\| | | | | | | | | | | | | * commit '59cb5747ec3c5cd842b94e574c37889521c97cc4': rtmpproto: read metadata to set correct FLV header Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: read metadata to set correct FLV headerUwe L. Korn2014-06-011-1/+65
| | | | | | | | | | | | | | | | 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>
* | Merge commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c'Michael Niedermayer2014-06-012-4/+27
|\| | | | | | | | | | | | | * commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c': rtmppkt: Add method to read an AMF string that is not prefixed by its type Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmppkt: Add method to read an AMF string that is not prefixed by its typeUwe L. Korn2014-06-012-4/+27
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a1859032e39d96352687186fd179e1559dea2aca'Michael Niedermayer2014-06-011-8/+0
|\| | | | | | | | | | | | | * commit 'a1859032e39d96352687186fd179e1559dea2aca': flvdec: Do not default to a video and audio stream Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Do not default to a video and audio streamUwe L. Korn2014-06-011-8/+0
| | | | | | | | | | | | | | | | | | 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>
* | x86: hevc_mc: remove unneeded shiftChristophe Gisquet2014-06-011-0/+10
| | | | | | | | | | | | The immediate value may be 0. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86: hevcdsp_init: fix macro usageChristophe Gisquet2014-06-011-18/+18
| | | | | | | | | | | | The macro was not using the parameter but unconditionally using sse4. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/options: use av_opt_copy() in avcodec_copy_context() to copy priv_dataMichael Niedermayer2014-06-011-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/opt: add av_opt_copy()Michael Niedermayer2014-06-014-1/+48
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>