virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
64,656 Commits 37 Branches 400 Tags 467 MiB
860d12978c
Commit Graph

64656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Muhammad Faiz
860d12978c doc/filters: fixing typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-14 10:43:27 +02:00
Michael Niedermayer
2db1bcf1b9 avformat/asfdec: Try to improve skip case 
Fixes Ticket3761

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-14 01:16:08 +02:00
Michael Niedermayer
cc3e7a4c3d Merge commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310' 
* commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310':
  x86: dsputil: Avoid pointless CONFIG_ENCODERS indirection

Conflicts:
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 21:51:20 +02:00
Michael Niedermayer
98227ba5fa Merge commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78' 
* commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78':
  ppc: dsputil: Coalesce all init files

Conflicts:
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/ppc/dsputil_ppc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 21:08:28 +02:00
Lukasz Marek
4cc0f79a2c lavf: add samba protocol via libsmbclient 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 20:38:55 +02:00
Michael Niedermayer
ccc4324c90 MAINTAINERS: Add ubitux for text subtitles 
ubitux maintains them. It seems it was forgotten to update MAINTAINERs though

See: Re: [FFmpeg-devel] [PATCH] MAINTAINERS: add Subtitle maintainer
     Message-ID: <20140713120546.GC26262@leki>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 19:29:23 +02:00
Star Brilliant
3f815f713b AVFormat: LRC demuxer and muxer 
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 19:18:31 +02:00
Diego Biurrun
acf91215c7 x86: dsputil: Avoid pointless CONFIG_ENCODERS indirection 
The remaining dsputil bits are encoding-specific anyway.
 2014-07-13 07:01:05 -07:00
Ben Avison
42c1cc35b7 armv6: Accelerate ff_imdct_half for general case (mdct_bits != 6) 
The previous implementation targeted DTS Coherent Acoustics, which only
requires mdct_bits == 6. This relatively small size lent itself to
unrolling the loops a small number of times, and encoding offsets
calculated at assembly time within the load/store instructions of each
iteration.

In the more general case (codecs such as AAC and AC3) much larger arrays
are used - mdct_bits == [8, 9, 11]. The old method does not scale for
these cases, so more integer registers are used with non-unrolled versions
of the loops (and with some stack spillage). The postrotation filter loop
is still unrolled by a factor of 2 to permit the double-buffering of some
VFP registers to facilitate overlap of neighbouring iterations.

I benchmarked the result by measuring the number of gperftools samples
that hit anywhere in the AAC decoder (starting from aac_decode_frame())
or specifically in ff_imdct_half_c / ff_imdct_half_vfp, for the same
example AAC stream:

                  Before          After
                  Mean   StdDev   Mean   StdDev  Confidence  Change
aac_decode_frame  2368.1 35.8     2117.2 35.3    100.0%      +11.8%
ff_imdct_half_*   457.5  22.4     251.2  16.2    100.0%      +82.1%

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 15:17:04 +02:00
James Almer
276bef5340 x86/hevc_deblock: add ff_hevc_[hv]_loop_filter_luma_{8, 10}_sse2 
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 13:48:31 +02:00
Ronald S. Bultje
ebd1c505d2 h264: fix direct temporal mvs for bottom-field-first poc order. 
Fixes http://forum.doom9.org/showthread.php?t=170867.
Fixes: corrupt-1677.mkv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 13:26:19 +02:00
Diego Biurrun
a8552ee3eb ppc: dsputil: Coalesce all init files 2014-07-13 04:10:13 -07:00
Michael Niedermayer
1e3f77b53a swscale/x86/rgb2rgb_template: fix 1 byte overread in yuyvtoyuv420 and uyvytoyuv420 
might fix ticket 3410

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 05:48:09 +02:00
Michael Niedermayer
4eb13cdfb0 avformat/asfdec: dvrms timestamps are pts not dts 
Should fix Ticket3328

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 03:50:47 +02:00
Michael Niedermayer
8202c49b43 avformat/utils: do not wait for packets from discarded streams for genpts 
Fixes long loop
Fixes Ticket3208

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 01:07:59 +02:00
Michael Niedermayer
12dddfed03 configure: fix alphabetical order of previous commit 
Was requested in review

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 23:24:16 +02:00
Andreas Cadhalpun
97592faa51 Add -Wformat and -Werror=format-security compiler flags 
These are part of the hardening flags used by Debian.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 23:15:23 +02:00
Andreas Cadhalpun
39a6e02fd4 fix spelling errors 
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 22:33:27 +02:00
Michael Niedermayer
4470a3eeaf avformat/mpegts: dont clear programs during probing 
Fixes Ticket 3763

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 21:49:15 +02:00
Michael Niedermayer
1db641cbd2 avcodec/hevc: more clearing to avoid stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 21:31:37 +02:00
Michael Niedermayer
ccd6911c18 avcodec/hevc_ps: do not loose all reference to pointers still in use 
Fixes leaving a pointer to unreferenced memory
Fixes Ticket 3115

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 21:03:09 +02:00
Michael Niedermayer
52fafaf474 swresample/libswresample.v: hide ff_* 
Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 18:40:17 +02:00
Oliver Fromme
699d2107be doc/encoders: Document "dvdsub workaround for some players" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 17:07:14 +02:00
Michael Niedermayer
e5eff191e4 ffplay: increase subtitle que size 
Fixes part of Ticket2516 with ffplay

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 16:29:03 +02:00
James Almer
123649dd19 x86/dsputilenc: remove some empty if statements 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 15:04:58 +02:00
Michael Niedermayer
66558fe715 avcodec/hevc_ps: Check layer_id_included_flags count 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 07:46:08 +02:00
Michael Niedermayer
6935ae22ed avcodec/hevc_ps: more complete check for vps_max_dec_pic_buffering 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 07:46:08 +02:00
Michael Niedermayer
5d88e40093 avcodec/hevc: check slice_header_extension data length 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 07:46:07 +02:00
Michael Niedermayer
c79acacd2e avcodec/hevc: fix nb_sh / nb_sps check 
fixes integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 04:39:01 +02:00
Lukasz Marek
ca671beead lavf/libssh: set freed pointers to NULL 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 03:01:38 +02:00
Michael Niedermayer
59975de777 ffmpeg: fix integer overflows with sub->*display_time 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 02:23:48 +02:00
Michael Niedermayer
2cebd17e3f avcodec/pgssubdec: Fix input pts 
Fixes part of Ticket2516

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 01:09:51 +02:00
Michael Niedermayer
15e933b773 Merge commit '6cc1409ba8650fb7eaedc96e970664febc02a5e9' 
* commit '6cc1409ba8650fb7eaedc96e970664febc02a5e9':
  examples/output: Remove unused variable

See: 9b211c43dc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 20:36:31 +02:00
Michael Niedermayer
b8cdf04726 Merge commit '1173320249745eab01c901a39054fc0fced33c87' 
* commit '1173320249745eab01c901a39054fc0fced33c87':
  dsputil: Drop unused bit_depth parameter from all init functions

Conflicts:
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 20:29:40 +02:00
Diego Biurrun
6cc1409ba8 examples/output: Remove unused variable 
doc/examples/output.c:460:9: warning: unused variable ‘i’
 2014-07-11 07:23:50 -07:00
Diego Biurrun
1173320249 dsputil: Drop unused bit_depth parameter from all init functions 2014-07-11 06:38:26 -07:00
Paul B Mahol
6779bf3f0f avformat/wavenc: use av_mallocz_array() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-07-11 10:38:45 +00:00
Michael Niedermayer
c6c172d173 avformat/mpegts: skip updating programs/streams when determining duration 
Fixes Ticket2441

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 16:43:27 +02:00
Michael Niedermayer
c9d64abedf avfilter/vf_decimate: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 15:32:27 +02:00
Michael Niedermayer
be55518fdb avfilter/vf_deshake: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 15:30:41 +02:00
Michael Niedermayer
4932b1e8b8 avfilter/vf_libopencv: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 15:00:49 +02:00
Michael Niedermayer
375d7ee805 Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e' 
* commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e':
  mov: Clarify tkhd flag settings

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 13:07:26 +02:00
Michael Niedermayer
4c91599484 Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996' 
* commit 'f90729699db9ede2bef2b28000f1795dab1b8996':
  mov: Do not group tracks if more than one is enabled per type

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 12:41:57 +02:00
Michael Niedermayer
e1f4397e74 Merge commit '458e7c94830d1522997e33a0b5e87bd709e8a349' 
* commit '458e7c94830d1522997e33a0b5e87bd709e8a349':
  hevc: implement pic_output_flag handling

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_refs.c

See: 2eddf3a6ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 12:21:41 +02:00
Michael Niedermayer
aa56c37c8a Merge commit 'f43789b76e661acd93c21664678f140e53cfa1fa' 
* commit 'f43789b76e661acd93c21664678f140e53cfa1fa':
  hevc: set the keyframe flag on output frames

See: e2760de605
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 12:16:24 +02:00
Michael Niedermayer
673a2b3818 Merge commit '1493b237bd3f9707319ac58d315ce45312900c10' 
* commit '1493b237bd3f9707319ac58d315ce45312900c10':
  hevc: Replace nal type chek with equivalent IS_IRAP macro

Conflicts:
	libavcodec/hevc.c

See: e2760de605
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 11:56:37 +02:00
Michael Niedermayer
f351afb5f9 Merge commit '17e9d52c8c93f47721ff481b8867922f4b4bd663' 
* commit '17e9d52c8c93f47721ff481b8867922f4b4bd663':
  hevc_ps: remove a write-only variable

Conflicts:
	libavcodec/hevc_ps.c

See: ba70563d55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 11:43:33 +02:00
Luca Barbato
df2aa22203 mov: Clarify tkhd flag settings 2014-07-11 11:07:35 +02:00
Luca Barbato
f90729699d mov: Do not group tracks if more than one is enabled per type 
The specification requires at most 1 track enabled per alternate group.
 2014-07-11 11:07:06 +02:00
Gildas Cocherel
458e7c9483 hevc: implement pic_output_flag handling 
Sample-Id: OPFLAG_B_Qualcomm_1.bit, OPFLAG_C_Qualcomm_1.bit
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-07-11 08:52:54 +00:00