virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
49,472 Commits 37 Branches 400 Tags 465 MiB
2b6a8187a6
Commit Graph

49472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marton Balint
1427c6842d ffplay: use videoq.serial to detect obsolete frames 
Previously VideoPicture->skip was used for that, using videoq.serial enables us
to detect obsolete frames right after pushing flush_pkt to the packet queue, so
we don't have to wait for the decoder thread to pop the flush packet anymore.

This is good because until now a full video picture queue may have blocked the
decoder thread.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-01-19 00:48:06 +01:00
Stefano Sabatini
d00df260ca lavf/segment: do not auto-select a video stream with attached_pic disposition 
In particular, fix trac ticket #2138.
 2013-01-19 00:32:08 +01:00
Stefano Sabatini
bbce913edf lavf/segment: move reference stream selection code to a dedicated function 2013-01-19 00:32:01 +01:00
Stefano Sabatini
1de369a632 lavf/segment: remove now unused field list_max_segment_time 2013-01-19 00:23:36 +01:00
Stefano Sabatini
d4890c1068 lavf/segment: add support to segment list file entries sliding window listing 
In particular, should fix trac ticket #1842.
 2013-01-19 00:22:58 +01:00
Stefano Sabatini
6b7d9d5153 lavf/segment: add SegmentListEntry and use it 
This patch is propedeutic to the incoming patch which adds
support to sliding window segment listing.
 2013-01-19 00:14:03 +01:00
Stefano Sabatini
176b72a28c lavf/utils: provide feedback in case of invalid probe size 
Log message in case the max_probe_size value in av_probe_input_buffer()
is smaller than the minimum accepted value.
 2013-01-19 00:13:52 +01:00
Paul B Mahol
c79be51dfc vf_fade: use AVPixFmtDescriptor to find out if pixel format have alpha 
Remove alpha_pix_fmts[].

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-18 22:51:05 +00:00
Michael Niedermayer
646ade7679 sws: Support error diffusion dither for mono output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-18 23:26:00 +01:00
Stefano Sabatini
24bbc416a4 doc/filters: create a dedicated "Examples" subsection for fade, and use @itemize 2013-01-18 23:18:01 +01:00
Stefano Sabatini
2852bd704a lavfi/fade: accept shorthand syntax 2013-01-18 23:17:47 +01:00
Diego Biurrun
822b0728f0 x86: dsputil: Drop some unused macro definitions 2013-01-18 22:24:58 +01:00
Martin Storsjö
f4facd2ce7 x86: Add a Yasm-based emms() replacement 
This provides a fallback when building with Yasm enabled, but neither
inline assembly, nor the _mm_empty intrinsic are available or enabled.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-18 22:02:13 +01:00
Diego Biurrun
d633d12b2c x86inc: Add cvisible macro for C functions with public prefix 
This allows defining externally visible library symbols.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-18 22:02:03 +01:00
Diego Biurrun
ef5d41a553 x86inc: Rename "program_name" to "private_prefix" 
The new name is more descriptive and will allow defining a separate
public prefix for externally visible library symbols.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-18 20:29:53 +01:00
Sean McGovern
6d1114a806 configure: Run SHFLAGS through ldflags_filter() 
These flags are as linker-specific as other LDFLAGS and thus
need to be translated to the correct linker syntax.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-18 19:10:29 +01:00
Stefano Sabatini
44d5a28b7d doc/filters: avoid @example for showing the drawbox shorthand syntax 
Improve overall consistency.
 2013-01-18 19:03:58 +01:00
Michael Niedermayer
fd165ace7b golomb: check log validity before shifting 
Fixes invalid right shift in fate-cavs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-18 15:41:32 +01:00
Paul B Mahol
d084c5c742 vf_fade: support YUVA422P & YUVA444P 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-18 14:35:30 +00:00
Michael Niedermayer
13178d002b h264/get_lowest_part_list_y: remove unneeded operations 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-18 15:06:38 +01:00
Michael Niedermayer
8ac0d95bd3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: avoid pointless copying of ref lists
  lavr: always reset mix function names and pointers in mix_function_init()
  lavr: call mix_function_init() in ff_audio_mix_set_matrix()
  fate: update ref after rv30_loop_filter fix
  rv30: fix masking in rv30_loop_filter()

Conflicts:
	tests/ref/fate/filter-delogo
	tests/ref/fate/rv30

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-18 13:54:38 +01:00
Michael Niedermayer
17596198ca Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f' 
* commit '80ac87c13dc8c6c063e26a464c5c542357c0583f':
  lavc: support ZenoXVID custom tag
  libcdio: support recent cdio-paranoia
  float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
  theora: Skip zero-sized headers

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-18 13:36:39 +01:00
Jonas Bechtel
a003c5bd4f Fix opencv detection. 
This commit changes the ".so" argument placement in check_ld sub-program.
 2013-01-18 10:30:43 +01:00
Anton Khirnov
940b8b5861 h264: avoid pointless copying of ref lists 
ref_list is constructed from other fields per slice when needed, so do
not copy it for both frame and slice threading.
default_ref_list is constructed per frame and still needs to be copied
to per-slice contexts for slice threading, but a copy is not needed for
frame threading.
 2013-01-18 07:56:05 +01:00
Michael Niedermayer
d270c32025 avcodec_decode_audio: do not trust the channel layout, use the channel count. 
Fixes memory corruption

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-18 01:29:38 +01:00
Justin Ruggles
b90632d596 lavr: always reset mix function names and pointers in mix_function_init() 
CC: libav-stable@libav.org
 2013-01-17 19:27:01 -05:00
Justin Ruggles
f07ef2d9c9 lavr: call mix_function_init() in ff_audio_mix_set_matrix() 
This is needed if a custom matrix is set by the user after opening the
AVAudioResampleContext because the matrix channel count can change if
different mixing coefficients are used.

CC:libav-stable@libav.org
 2013-01-17 19:27:01 -05:00
Michael Niedermayer
4aed4f5846 mlpdec: dont leave a invalid huff_lsb in the context. 
Fix assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-18 00:23:17 +01:00
Michael Niedermayer
e1d7d4bd13 mpegvideo: reset context state on failed thread update. 
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-17 23:43:35 +01:00
Luca Barbato
56ef1ef1f7 fate: update ref after rv30_loop_filter fix 2013-01-17 23:40:48 +01:00
Xi Wang
783e37f7ef rv30: fix masking in rv30_loop_filter() 
The mask `x && (1 << y)' is incorrect and always yields true.

The correct form should be `x & (1 << y)'.

CC: libav-stable@libav.org

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-17 21:55:27 +01:00
Luca Barbato
80ac87c13d lavc: support ZenoXVID custom tag 
Looks like this kind of samples are produced by certain Russian
equipment.
 2013-01-17 21:41:18 +01:00
Luca Barbato
43e0e0c4e5 libcdio: support recent cdio-paranoia 
Upstream decided to split the paranoia interface and move the headers
accordingly.
 2013-01-17 21:41:18 +01:00
Carl Eugen Hoyos
9a038a95d2 Use new function av_codec_get_tag2() in ffmpeg.c. 
Fixes ticket #1953.
 2013-01-17 20:46:21 +01:00
Carl Eugen Hoyos
a1a707f728 Add a new function av_codec_get_tag2(). 
av_codec_get_tag() may return 0 both in case a codec_tag was
found and if no codec_tag was found.
The new function does not have this ambiguity.
 2013-01-17 20:44:33 +01:00
Paul B Mahol
8fdd24455e .gitignore: add /doc/examples/pc-uninstalled 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-17 17:59:18 +00:00
Martin Storsjö
973b4d44f1 float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window 
This fixes builds on 64bit MSVC.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-17 19:07:35 +02:00
Martin Storsjö
e33db35b4a theora: Skip zero-sized headers 
This fixes a regression since d9cf5f51 with theora over RTP
(possibly with other variants of theora as well).

In theora over RTP, the second of the 3 headers turns out to be
0 bytes long, which prior to d9cf5f51 worked just fine. After
d9cf5f51, reading from the bitstream reader fails (since the reader
wasn't initialized but returned an error if initialized with 0 bits).

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-17 19:06:56 +02:00
Carl Eugen Hoyos
ad406f7e40 Only skip MLP header in mpeg files if the codec actually is MLP. 
Fixes PCM audio in Kansas Pheasant Hunt 2000 mpg file.
Reported-by: Mashiat Sarker Shakkhar
 2013-01-17 17:19:08 +01:00
Carl Eugen Hoyos
12cb21efa6 Make the latm decoder less verbose on initialisation. 
Reviewed-by: Paul B Mahol
 2013-01-17 16:12:59 +01:00
Michael Niedermayer
46730e7a0c mux/chunked interleaver: better align duration chunks. 
This code causes the chunking to tend toward more optimal
alignment between streams.
The first chunks can still be less optimal aligned
 2013-01-17 15:11:02 +01:00
Michael Niedermayer
69a96f9d4c mux: de-obfuscate chunked interleaver checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-17 15:08:50 +01:00
Michael Niedermayer
c57c1329a9 mux: simplify chunking interleaver code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-17 14:45:30 +01:00
Michael Niedermayer
2dc9bcad7d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  idcin: fix memleaks in idcin_read_packet()

Conflicts:
	libavformat/idcin.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-17 13:44:37 +01:00
James Almer
b454c64e03 latmenc: Check for LOAS sync word 
Write the packet unaltered if found.

Fixes ticket #1917

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-17 04:55:14 +01:00
Carl Eugen Hoyos
c345100efc Fix detection of struct v4l2_frmsize_discrete. 
It was always detected successfully.
 2013-01-17 02:11:12 +01:00
Michael Niedermayer
765a3ba018 h264: add assert to check that block_offset is consistent. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-17 00:21:58 +01:00
Michael Niedermayer
97d190283e h264: always copy linesizes in thread update 
Fixes inconsistencies in context

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-17 00:21:58 +01:00
Michael Niedermayer
f674cc776f h264: always copy block_offset in thread update 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-17 00:21:58 +01:00
Paul B Mahol
641bbd9671 vima: switch to init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-16 20:56:14 +00:00