]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 30 Dec 2012 13:11:11 +0000 (14:11 +0100)]
Merge commit '
9b1370aced385698bc783747917544ab69ecb373 '
* commit '
9b1370aced385698bc783747917544ab69ecb373 ':
hlsenc: do not add timestamps in different timebases
hlsenc: use the correct AV_TIME_BASE macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Dec 2012 13:02:14 +0000 (14:02 +0100)]
Merge commit '
0448f26c97c5ab4858d31e456a4f1738ae783242 '
* commit '
0448f26c97c5ab4858d31e456a4f1738ae783242 ':
hlsenc: keep the playlist to the correct number of items
hlsenc: use the segment filename in the playlist entry
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Dec 2012 12:54:50 +0000 (13:54 +0100)]
Merge commit '
6dd93ee6f1b050ad7c4b247899e83efa293ee405 '
* commit '
6dd93ee6f1b050ad7c4b247899e83efa293ee405 ':
hlsenc: check append_entry return value
hlsenc: use the basename to generate the list entries
avstring: add av_basename and av_dirname
Conflicts:
Changelog
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 30 Dec 2012 06:17:33 +0000 (07:17 +0100)]
Merge back some registering macros in all*.c.
This breaks the sed in configure:find_things(). Fixes regression from
c73c87b . Fixes Ticket2079.
Found-by: jamal
Clément Bœsch [Sun, 30 Dec 2012 05:53:48 +0000 (06:53 +0100)]
lavc/ass_split: check for NULL pointer in ff_ass_split_override_codes().
This is consistent with the other ff_ass_split_* functions.
It also fixes a crash when trying to split a dialog with text=NULL
(which seems to happen when the text of the dialog is empty); basically,
this commit fixes crashes when trying to encode an empty text subtitle
dialog (see subrip and mov_text encoders).
Fixes Ticket2048.
Michael Niedermayer [Sun, 30 Dec 2012 04:07:12 +0000 (05:07 +0100)]
aacdec: make dual mono mode selectable through AVOptions too.
Based on patch by Akihiro Tsukada
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Dec 2012 03:55:14 +0000 (04:55 +0100)]
aacdec: simplify dmono
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Dec 2012 03:43:44 +0000 (04:43 +0100)]
aacdec: fix dual mono
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 24 Dec 2012 05:08:07 +0000 (06:08 +0100)]
build: postproc cleanup.
This reverts
79f80f5c , moves postproc along with the other libraries,
and fix the postproc dependency to libavutil.
Michael Niedermayer [Sat, 29 Dec 2012 19:50:43 +0000 (20:50 +0100)]
sws: fix warning: cast from pointer to integer of different size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Dec 2012 19:00:48 +0000 (20:00 +0100)]
vf_deshake: fix strict aliassing errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Dec 2012 18:39:14 +0000 (19:39 +0100)]
swscale: fix warning: assignment from incompatible pointer type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Dec 2012 18:37:20 +0000 (19:37 +0100)]
motion_est_template: fix warning: "ASSERT_LEVEL" is not defined
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Dec 2012 18:27:07 +0000 (19:27 +0100)]
bktr: fix warning: missing braces around initializer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dave Yeo [Sat, 29 Dec 2012 01:53:43 +0000 (17:53 -0800)]
Fix OS/2 threading
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Dec 2012 02:20:37 +0000 (03:20 +0100)]
avf_concat: init pointers to NULL for saftey and to avoid warning of uninitialized use.
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 27 Dec 2012 22:30:40 +0000 (19:30 -0300)]
wavdec: fix duration calculation for files with invalid data size
Some wav files report a data size that is bigger than the actual file size.
Fall back to estimation from bitrate in such cases.
Fixes ticket #2065.
Signed-off-by: James Almer <jamrial@gmail.com>
Luca Barbato [Sat, 29 Dec 2012 10:46:01 +0000 (11:46 +0100)]
hlsenc: do not add timestamps in different timebases
start_time is in stream timebase units while end_time is
in AV_TIME_BASE ones.
Luca Barbato [Tue, 25 Dec 2012 09:05:42 +0000 (10:05 +0100)]
hlsenc: keep the playlist to the correct number of items
Consider the corner case with a list size larger than the wrap
number.
Kanglin [Sat, 29 Dec 2012 10:44:33 +0000 (11:44 +0100)]
hlsenc: use the correct AV_TIME_BASE macro
recording_time is in AV_TIME_BASE units.
Luca Barbato [Tue, 25 Dec 2012 07:59:38 +0000 (08:59 +0100)]
hlsenc: check append_entry return value
Luca Barbato [Tue, 25 Dec 2012 08:14:59 +0000 (09:14 +0100)]
hlsenc: use the segment filename in the playlist entry
Avoid calling av_get_frame_filename twice, once to generate the
segment filename and once to generate the playlist.
Luca Barbato [Sun, 23 Dec 2012 23:08:35 +0000 (00:08 +0100)]
hlsenc: use the basename to generate the list entries
The segment path is desumed from the playlist path, recording a
relative path in the playlist while serving the file could lead
to misleading results.
Luca Barbato [Sun, 23 Dec 2012 20:25:24 +0000 (21:25 +0100)]
avstring: add av_basename and av_dirname
Thread safe version of the common basename and dirname.
Michael Niedermayer [Sat, 29 Dec 2012 14:37:05 +0000 (15:37 +0100)]
lavfi: replace REGISTER_BUILTIN_FILTER() by REGISTER_FILTER_UNCONDITIONAL()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Dec 2012 13:27:38 +0000 (14:27 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: Prettyprint codec/format/filter registration files
Conflicts:
libavcodec/allcodecs.c
libavdevice/alldevices.c
libavfilter/allfilters.c
libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Dec 2012 12:05:37 +0000 (13:05 +0100)]
Merge commit '
69583bd3b1eba471366141c945030c163e073e02 '
* commit '
69583bd3b1eba471366141c945030c163e073e02 ':
avfilter: Refactor unconditional filter registration
build: Add rtpenc_chain extra config option
configure: Add --disable-all command line option
Conflicts:
libavfilter/allfilters.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Dec 2012 03:34:23 +0000 (04:34 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: fix type of time_diff in waveform display
ffplay: always display audio visualization if mode is set
ffplay: hide cursor on no mouse movement
ffplay: reset external clock to unknown on start
ffplay: only drop frames if not in frame step mode
ffplay: move frame step pause from the video thread to video_refresh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Dec 2012 02:37:46 +0000 (03:37 +0100)]
xtea: fix unused variable warning for config_small
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Dec 2012 02:06:08 +0000 (03:06 +0100)]
msmpeg4enc: fix possible use of uninitialized warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Dec 2012 01:51:51 +0000 (02:51 +0100)]
hpel_motion_search: move code used for asserts under correct #if
This avoids compiler warnings about set but not used variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Dec 2012 01:44:43 +0000 (02:44 +0100)]
ivi_common: Fix use of uninitialized warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Dec 2012 01:42:30 +0000 (02:42 +0100)]
avs: silence "may be used uninitialized" warnings
We initialize the struct to 0 to also ensure any actual use of
the pointers in it will not lead to security issues.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 28 Dec 2012 22:18:48 +0000 (22:18 +0000)]
mmfenc: use ff_raw_write_packet()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 28 Dec 2012 22:06:39 +0000 (22:06 +0000)]
aiffenc: use ff_raw_write_packet()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 28 Dec 2012 21:57:01 +0000 (21:57 +0000)]
soxenc: use ff_raw_write_packet()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 28 Dec 2012 21:50:42 +0000 (21:50 +0000)]
soxdec: use meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 28 Dec 2012 21:47:47 +0000 (21:47 +0000)]
soxenc: use ffio_fill
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 28 Dec 2012 21:36:03 +0000 (21:36 +0000)]
soxenc: use FFALIGN
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 28 Dec 2012 19:38:41 +0000 (20:38 +0100)]
h264: avoid a grayscale related if() in hl_decode_mb()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Tue, 25 Dec 2012 23:26:59 +0000 (00:26 +0100)]
ffplay: fix type of time_diff in waveform display
Fixes time diff overflow visible as showing the same few waveforms in a loop at
the end of file.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Tue, 25 Dec 2012 23:06:19 +0000 (00:06 +0100)]
ffplay: always display audio visualization if mode is set
Fixes ticket #1903.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 1 Dec 2012 01:27:29 +0000 (02:27 +0100)]
ffplay: hide cursor on no mouse movement
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Thu, 20 Dec 2012 23:32:18 +0000 (00:32 +0100)]
ffplay: reset external clock to unknown on start
Fixes a delay and initial frame drops on starting realtime streams with
external clock.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Wed, 26 Dec 2012 18:53:58 +0000 (19:53 +0100)]
ffplay: only drop frames if not in frame step mode
Fixes ticket #2053.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Tue, 25 Dec 2012 21:35:53 +0000 (22:35 +0100)]
ffplay: move frame step pause from the video thread to video_refresh
This way we pause the video right after we displayed a new frame. Partially
fixes ticket #2053.
Signed-off-by: Marton Balint <cus@passwd.hu>
Diego Biurrun [Tue, 25 Dec 2012 14:29:39 +0000 (15:29 +0100)]
cosmetics: Prettyprint codec/format/filter registration files
Diego Biurrun [Sun, 23 Dec 2012 18:06:35 +0000 (19:06 +0100)]
avfilter: Refactor unconditional filter registration
Diego Biurrun [Thu, 29 Nov 2012 09:34:54 +0000 (10:34 +0100)]
build: Add rtpenc_chain extra config option
Also fixes linking in various configs with only individual parts enabled
because the RTP muxer chaining code depends on the general RTP code,
which is now accounted for.
Diego Biurrun [Sat, 10 Nov 2012 13:47:52 +0000 (14:47 +0100)]
configure: Add --disable-all command line option
This option disables all programs, libraries and other parts of Libav
that get built as part of the compilation process.
Paul B Mahol [Fri, 28 Dec 2012 13:21:36 +0000 (13:21 +0000)]
auenc: do not write invalid file size
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 28 Dec 2012 16:05:19 +0000 (17:05 +0100)]
vf_divtc: dont mix av_strdup and free
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Dec 2012 16:04:54 +0000 (17:04 +0100)]
vf_detc: dont mix av_strdup & free
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Dec 2012 16:00:01 +0000 (17:00 +0100)]
vf_mp: fix 'discards const qualifier from pointer target type'
args are not supposed to be changed by filters even if the argument is
not marked as const.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Dec 2012 12:55:58 +0000 (13:55 +0100)]
libavutil/samplefmt: Fix project name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Dec 2012 11:56:24 +0000 (12:56 +0100)]
MAINTAINERS: s/mjpeg.c/mjpeg*.c/
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 9 Dec 2012 19:26:30 +0000 (20:26 +0100)]
lavf/segment: add segment_frames option
This is meant to address trac ticket #1483.
Stefano Sabatini [Sat, 22 Dec 2012 20:49:06 +0000 (21:49 +0100)]
lavf/segment: add reference_stream option
Michael Niedermayer [Fri, 28 Dec 2012 01:47:25 +0000 (02:47 +0100)]
libpostproc: alloc a few bytes more in the temporary buffer
This avoids dering reading 4 bytes prior the buffer (1 byte can
be used)
Fixes Ticket2057
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Dec 2012 00:48:40 +0000 (01:48 +0100)]
libpostproc: Fix off by 1 error in the C dering code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Dec 2012 22:16:54 +0000 (23:16 +0100)]
mjpegdec: Support 16bit DQT
Fixes Ticket2072
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 27 Dec 2012 18:20:54 +0000 (18:20 +0000)]
build: fix g723_1 decoder dependency
g723_1 decoder needs celp_math.o because it calls ff_dot_product().
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Don Moir [Thu, 27 Dec 2012 18:06:49 +0000 (18:06 +0000)]
gifdec: fix transparent background color
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 27 Dec 2012 16:39:10 +0000 (17:39 +0100)]
mjpegdec: reset restart_count on progressive scans
Fixes Ticket2068
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 26 Dec 2012 23:56:47 +0000 (00:56 +0100)]
doc/encoders: clarify the direction of the quality setting parameters for libtheora
Stefano Sabatini [Wed, 26 Dec 2012 16:42:45 +0000 (17:42 +0100)]
doc/ffmpeg-formats: extend documentation for the probesize parameter
Stefano Sabatini [Sat, 22 Dec 2012 23:19:11 +0000 (00:19 +0100)]
ffmpeg: remove annoying logs and improve reporting in case of unavailable bitrate
Michael Niedermayer [Thu, 27 Dec 2012 11:15:59 +0000 (12:15 +0100)]
MAINTAINERS: add libswresample
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rob Sykes [Thu, 27 Dec 2012 11:07:15 +0000 (12:07 +0100)]
docs: add soxr documentation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rob Sykes [Thu, 27 Dec 2012 10:59:55 +0000 (11:59 +0100)]
soxr_resample: soxr API parameter rename
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rob Sykes [Thu, 27 Dec 2012 10:57:32 +0000 (11:57 +0100)]
soxr_resample: Correct email address
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 26 Dec 2012 20:32:38 +0000 (21:32 +0100)]
lavfi/tile: small align cosmetics.
Clément Bœsch [Wed, 26 Dec 2012 19:19:30 +0000 (20:19 +0100)]
lavfi/tile: remove usage of link->{cur,out}_buf.
Clément Bœsch [Wed, 26 Dec 2012 19:00:10 +0000 (20:00 +0100)]
lavfi/scale: remove usage of link->cur_buf.
Clément Bœsch [Wed, 26 Dec 2012 19:00:00 +0000 (20:00 +0100)]
lavfi/deshake: remove usage of link->cur_buf.
Clément Bœsch [Wed, 26 Dec 2012 18:56:53 +0000 (19:56 +0100)]
lavfi/decimate: remove usage of link->cur_buf.
Clément Bœsch [Wed, 26 Dec 2012 18:29:44 +0000 (19:29 +0100)]
lavfi/video: remove unused ff_inplace_start_frame().
Michael Niedermayer [Wed, 26 Dec 2012 19:23:09 +0000 (20:23 +0100)]
mjpegdec: handle the occurance of rstn emulation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 25 Dec 2012 02:54:51 +0000 (03:54 +0100)]
mjpegdec: Handle RSTn in progressive jpegs
Fixes Ticket2003
Reviewed-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 25 Dec 2012 02:54:25 +0000 (03:54 +0100)]
mjpegdec: factor handle_rstn() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 26 Dec 2012 18:48:26 +0000 (18:48 +0000)]
build: mp filter does not depend on postproc anymore
This fixes testprogs build target if libpostproc is disabled.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 26 Dec 2012 02:22:26 +0000 (03:22 +0100)]
vf_idet: fix type of stats
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 26 Dec 2012 01:50:06 +0000 (02:50 +0100)]
lavfi/idet: remove unused assert include.
Clément Bœsch [Wed, 26 Dec 2012 01:48:07 +0000 (02:48 +0100)]
lavfi/idet: remove unecessary context assignment.
Clément Bœsch [Wed, 26 Dec 2012 01:47:25 +0000 (02:47 +0100)]
lavfi/idet: support named parameters.
The parameters are currently not documented in doc/filters.texi, but now
they at least appear in the automatic help.
Clément Bœsch [Wed, 26 Dec 2012 01:33:26 +0000 (02:33 +0100)]
lavfi/idet: remove unecessary poll_frame callback.
Michael Niedermayer [Wed, 26 Dec 2012 13:35:54 +0000 (14:35 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: initialize videodsp with correct pixel depth
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Dec 2012 13:23:54 +0000 (14:23 +0100)]
vc1dsp: fix the warning fix, make it work with --disable-asm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 26 Dec 2012 00:39:08 +0000 (01:39 +0100)]
doc/resampler: extend docs for min_comp and min_hard_comp options
Based on the text from the aresample filter docs.
Stefano Sabatini [Wed, 26 Dec 2012 00:26:55 +0000 (01:26 +0100)]
lavfi/aresample: fix style
Improve overall consistency/improve readability.
Michael Niedermayer [Wed, 26 Dec 2012 02:14:59 +0000 (03:14 +0100)]
libswscale/swscale-test: fix some const correctness
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Dec 2012 02:00:35 +0000 (03:00 +0100)]
vc1dsp: fix pointer type warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Dec 2012 00:53:45 +0000 (01:53 +0100)]
lavc/utils: fix 'warning: missing braces around initializer'
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Dec 2012 00:37:38 +0000 (01:37 +0100)]
lcldec: fix zlib const pointer warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Dec 2012 00:36:00 +0000 (01:36 +0100)]
imgconvert: fix 2 "discards const qualifier from pointer target type"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Dec 2012 00:34:26 +0000 (01:34 +0100)]
imgconvert: dont depend on default return type for get_color_type()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Dec 2012 00:23:19 +0000 (01:23 +0100)]
h264_direct: silence several warning: assignment from incompatible pointer type"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Tue, 25 Dec 2012 23:24:21 +0000 (00:24 +0100)]
mpegvideo: initialize videodsp with correct pixel depth
Fixes decoding of 9/10 bit per pixel h264 videos as reported in
https://bugzilla.libav.org/show_bug.cgi?id=404 .
Jean First [Sat, 31 Dec 2011 13:15:35 +0000 (14:15 +0100)]
rmdec: fix compiler warning for uninitialized variables
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
XBMC [Sun, 16 Dec 2012 08:53:18 +0000 (09:53 +0100)]
mpegts: update AVProgram after pmt change
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>