virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
67,376 Commits 37 Branches 400 Tags 460 MiB
e1bcbca998
Commit Graph

67376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
e1bcbca998 Merge commit 'c442190a6bfd8036f6c32b78e1e96ff3b830f8f0' 
* commit 'c442190a6bfd8036f6c32b78e1e96ff3b830f8f0':
  error_resilience: initialize prev_* variables

Note, these variables are not used without initialization prior
to the change

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 21:28:48 +01:00
Michael Niedermayer
567ea2d64c Merge commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26' 
* commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26':
  motion_est: remove dead code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 21:10:02 +01:00
Michael Niedermayer
a28313b09e Merge commit '351d0f8b7a6ecce411ae75fb3511573c34317218' 
* commit '351d0f8b7a6ecce411ae75fb3511573c34317218':
  get_bits: remove unused assignment

Conflicts:
	libavcodec/get_bits.h

See: ea6178fff8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 21:03:06 +01:00
Michael Niedermayer
66b9e60af0 ffmpeg_opt: store canvas size in decoder context 
Fixes canvas size
Fixes Ticket4074

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 20:55:15 +01:00
Michael Niedermayer
786594184a avformat/mpegts: fix iteration count in add_pid_to_pmt() 
Fixes accessing uninitialized memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 19:31:59 +01:00
Michael Niedermayer
09024fe681 avfilter/af_aresample: Limit data per inserted packet 
This avoids creating unwieldy large packets, which is allowed but
does not seem to be a good idea

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 17:17:24 +01:00
Michael Niedermayer
97da68172a avfilter/af_aresample: split flushing code out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 17:17:23 +01:00
Michael Niedermayer
e4f8a973aa swresample: Fix swr_drop_output so it does not flush the buffers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 17:17:23 +01:00
Benoit Fouet
dc351e1381 id3v2: prefer TDRC for date over TDRL. 
TDRL is what we used as a replacement of TYER, and, according to
http://id3.org/id3v2.4.0-changes :
    TYER - Year
        This frame is replaced by the TDRC frame, 'Recording time'
        [F:4.2.5].
So change TDRL usages to TDRC.

Fixes ticket #3694

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 14:11:53 +01:00
Michael Niedermayer
3dae05f4f7 avformat/mpegts: also print PMT version in av_dlog() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 01:18:39 +01:00
Michael Niedermayer
09711545f5 avformat/rtmpproto: Do not fail when the length cannot be determined for live streams 
Fixes Ticket4071

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 00:35:32 +01:00
Michael Niedermayer
db0471c40f avformat/mpegts: Continue parsing PMTs during duration estimation 
This way if we by chance run into a valid PMT we have a more complete
set of streams, also do not reset streams in case we run into a worse
PMT

Fixes Ticket4046

alternatively Ticket4046 could be closed as invalid or wontfix as it contains
some PMTs which lack the 2 subtitle streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 22:55:07 +01:00
Michael Niedermayer
a7f25979dd avformat/utils: Leave skip_clear enabled until after estimate_timings() 
Should make no difference but will be needed for subsequent commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 22:53:48 +01:00
Michael Niedermayer
a6593f7cc6 avformat/mpegts: Do not add pid if its already there with add_pid_to_pmt() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 22:25:55 +01:00
Michael Niedermayer
716674b151 avcodec/libwebpenc: add quality option 
previously quality could only be set through qscale/global_quality but the scale
was inverted. Using a separate option avoids the confusion from qscale working
backward.

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Clément Bœsch <u@pkh.me>
Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 19:10:22 +01:00
Michael Niedermayer
bd0f866731 doc: Better documentation for the bitexact flag 
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 18:54:51 +01:00
Vittorio Giovara
c442190a6b error_resilience: initialize prev_* variables 
CC: libav-stable@libav.org
Bug-Id: CID 732293 / CID 732294
 2014-11-03 12:45:09 -05:00
Michael Niedermayer
898635ad9e avfilter/vf_idet: use exp2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 17:22:33 +01:00
Michael Niedermayer
4bbd8f05f7 avfilter/vf_idet: use av_rescale() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 17:22:16 +01:00
Michael Niedermayer
5d590d87b3 avfilter/vf_idet: fix rounding of av_dict_set_fxp() 
fixes the remainder overflowing beyond .999

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 17:14:29 +01:00
Kevin Mitchell
fe6f5f2908 avfilter/vf_idet: add a "half_life" option for statistics 
This can be useful for videos in which the interlacing pattern changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 16:31:26 +01:00
Vittorio Giovara
240b22afe1 motion_est: remove dead code 
mb_type is initialized to 0 and never updated before the check.

Bug-Id: CID 1238782
 2014-11-03 10:15:53 -05:00
Vittorio Giovara
351d0f8b7a get_bits: remove unused assignment 
Bug-Id: CID 1238816
 2014-11-03 10:15:07 -05:00
Benoit Fouet
50138ea4f7 configure: add xcb cflags and extralibs to cflags and extralibs. 
Replace xcb_event by xcb, as the former is no more used and the latter
is needed on configurations where only xcb is available, and not
libxcb_shm and/or libxcb_xfixes.

Signed-off-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 13:31:09 +01:00
Michael Niedermayer
206c98f303 avcodec/options_table fix min of audio channels and sample rate 
Found-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 13:21:07 +01:00
Michael Niedermayer
ea0b9218f4 Merge commit '2f221b6a9365aa400061e16266f2d1242f7169f8' 
* commit '2f221b6a9365aa400061e16266f2d1242f7169f8':
  movenc: Define the flag bits using shifts instead of as decimal numbers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-03 11:52:55 +01:00
Martin Storsjö
2f221b6a93 movenc: Define the flag bits using shifts instead of as decimal numbers 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-11-03 11:43:58 +02:00
Stefano Sabatini
f0158e6f0c lavf/flvenc: fail in case the muxed packet is too big 
Avoid the creation of files which cannot be successfully decoded by
ffmpeg, for example generated with:
ffmpeg -f lavfi -i sine -af "aselect='not(between(t,100,500))',aresample=min_comp=0.001:min_hard_comp=0.100000" -acodec pcm_s16le -t 1000 -y out_audio.flv
 2014-11-03 09:31:48 +01:00
Clément Bœsch
4f4de7f49e README: fix 2 typo in the doc/examples sentence 2014-11-03 09:21:45 +01:00
Reynaldo H. Verdejo Pinochet
33aacb7750 ffserver_config: add fixme on buffer_aggressivity/eq deprecation 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-11-02 22:10:54 -03:00
Reynaldo H. Verdejo Pinochet
17cc78505c ffserver_config: simplify some if true conditions 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-11-02 22:05:54 -03:00
Reynaldo H. Verdejo Pinochet
200270cc8b ffserver_config: fix line lengths 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-11-02 21:54:23 -03:00
Carl Eugen Hoyos
d457478fb0 Silence warnings for fic files with zero-sized cursors. 
Fixes ticket #4072.
 2014-11-03 00:43:08 +01:00
Carl Eugen Hoyos
e6b7246a68 lavf/movenc: Write G.726 bitrate to make the files decodable. 
Fixes ticket #4069.
 2014-11-03 00:38:13 +01:00
Lukasz Marek
9c097f1cfc ffserver_config: improve AVOption handing 
AVOption are checked right after found in config file.
It allows to report exact line in config file.

Options provided more than once are threated as errors.

It also fixes flag options handing.
Flags may occur more than once in config file.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-03 00:32:25 +01:00
Lukasz Marek
2121e3e130 ffserver_config: improve error handling 
Replace atoi with more advanced parsing routine.
Set maximum port value to 65535 (not 65536).
Other checks.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-02 23:44:22 +01:00
Michael Niedermayer
63e62cfbe2 avformat/img2enc: Use localtime_r() for thread saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-02 20:09:16 +01:00
Michael Niedermayer
5ece4f8b73 avformat/sbgdec: Use localtime_r() for thread saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-02 20:08:59 +01:00
Michael Niedermayer
76886589ee avformat/wavenc: Use localtime_r() for thread saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-02 20:08:12 +01:00
Michael Niedermayer
32a2876b12 avformat/segment: use time_internal.h, simplify code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-02 20:07:34 +01:00
Michael Niedermayer
bab09864b4 avcodec/jacosubdec: use time_internal.h, simplify code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-02 20:06:40 +01:00
Michael Niedermayer
013c3eb05c avfilter/vf_drawtext: use gm_time_r() for thread saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-02 19:20:26 +01:00
Michael Niedermayer
a52cb42ba6 avformat/matroskadec: use gmtime_r() for thread saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-02 19:19:07 +01:00
Michael Niedermayer
70b7cf9c39 avformat/webpenc: removed unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-02 11:43:48 +01:00
Michael Niedermayer
547fce9585 avcodec/h264_slice: Clear table pointers to avoid stale pointers 
Might fix Ticket3889

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-02 01:56:38 +01:00
Michael Niedermayer
f5abd12c4d avformat/img2enc: remove webp extension as we have a dedicated webp muxer 
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-02 01:00:57 +01:00
Lukasz Marek
e9899ca3dd ffserver_config: dont pass pointer to enum as pointer to int 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-02 00:01:29 +01:00
Michael Niedermayer
5aaf5df06d avcodec/libwebpenc: support "P" frames in webp animations 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-01 20:10:52 +01:00
Michael Niedermayer
6d64a14e6d avformat: add webp muxer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-01 20:10:52 +01:00
Rodger Combs
ae437c7ce7 avformat/assenc: Add ignore_gaps option 
Signed-off-by: Clément Bœsch <u@pkh.me>
 2014-11-01 19:38:48 +01:00