]>
git.sesse.net Git - ffmpeg/log
Nicolas George [Sun, 30 Dec 2012 18:28:51 +0000 (19:28 +0100)]
lavfi: merge all filtering code into ff_filter_frame.
Hendrik Leppkes [Sun, 15 Jul 2012 08:58:27 +0000 (10:58 +0200)]
mov: fix parsing of the chap atom.
This was broken in
0d96ec19ebc1577b27a889136364a906e1c627b1 under the
assumption that there is only one tref leaf atom.
Fixes Ticket #2081.
Paul B Mahol [Sun, 30 Dec 2012 18:08:29 +0000 (18:08 +0000)]
fate: add nistsphere demuxer test
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 1 Jan 2013 13:04:50 +0000 (14:04 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Add support for limelight authentication
rtmp: Add support for adobe authentication
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 1 Jan 2013 12:55:27 +0000 (12:55 +0000)]
lavfi/avcodec: fix typo
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 1 Jan 2013 12:54:12 +0000 (13:54 +0100)]
Merge commit '
33f28a3be3092f642778253d9529dd66fe2a014a '
* commit '
33f28a3be3092f642778253d9529dd66fe2a014a ':
rtmp: Add a function for writing AMF strings based on two substrings
rtmp: Return a proper error code in handle_invoke_error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 1 Jan 2013 12:30:42 +0000 (13:30 +0100)]
ffprobe: do not escape '"' between single quotes.
Clément Bœsch [Tue, 1 Jan 2013 09:59:51 +0000 (10:59 +0100)]
doc/resampler: remove .html from link text.
Michael Niedermayer [Tue, 1 Jan 2013 03:59:03 +0000 (04:59 +0100)]
ffmpeg: avoid negative timestamps for DVD
dvdauthor cannot handle files with ts wraps
Fixes ticket383
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 30 Dec 2012 14:15:50 +0000 (15:15 +0100)]
lavfi: add avfilter_get_audio_buffer_ref_from_arrays_channels.
It is the same as avfilter_get_audio_buffer_ref_from_arrays
except it has a "channels" and the channel layout can be 0.
Michael Niedermayer [Mon, 31 Dec 2012 23:35:02 +0000 (00:35 +0100)]
rawdec: fix decoding of odd dimensioned raw yv12
Fix Ticket339 part 2 of 2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 31 Dec 2012 23:38:01 +0000 (00:38 +0100)]
mov: fix handling of odd sized yv12
Part 1 of 2 to fix Ticket339
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 31 Dec 2012 19:52:52 +0000 (20:52 +0100)]
mpeg12: fix frame_pred_frame_dct handling in field pictures
Fixes Ticket254
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 31 Dec 2012 19:33:22 +0000 (20:33 +0100)]
mpeg12: print invalid cbp value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 31 Dec 2012 19:32:37 +0000 (20:32 +0100)]
mpeg12: print error for invalid skip cases
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Mon, 31 Dec 2012 11:13:36 +0000 (12:13 +0100)]
lavc/flacenc: improve error return.
Use meaningful error codes and add log messages.
Nicolas George [Mon, 31 Dec 2012 13:40:33 +0000 (14:40 +0100)]
lavfi/avfiltergraph: print query_formats errors.
Nicolas George [Mon, 31 Dec 2012 11:12:23 +0000 (12:12 +0100)]
lswr: improve rematrixing error message.
Report channel layout/count for insufficiently determined
rematrixing.
Michael Niedermayer [Mon, 31 Dec 2012 13:15:42 +0000 (14:15 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: suppress -fPIC in msvc builds
Drop unnecessary 'l' length modifier when printfing double values.
truemotion2: Sanitize tm2_read_header()
Conflicts:
libavcodec/truemotion2.c
libavfilter/src_movie.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 31 Dec 2012 12:40:15 +0000 (13:40 +0100)]
Merge commit '
5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01 '
* commit '
5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01 ':
FATE: add cavs test
cavsdec: export picture type in the output frame
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 31 Dec 2012 12:26:12 +0000 (13:26 +0100)]
Merge commit '
7d8482640058d66867602a6f58446c9342d9d146 '
* commit '
7d8482640058d66867602a6f58446c9342d9d146 ':
cavs: deMpegEncContextize
Note, the bugfixes have all been in FFmpeg previously, this just switches away
from MpegEncContext
Conflicts:
libavcodec/cavs.c
libavcodec/cavsdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 31 Dec 2012 12:14:06 +0000 (13:14 +0100)]
Merge commit '
64bb3fa6b7f5b2db22b7577585d5861be24eebd8 '
* commit '
64bb3fa6b7f5b2db22b7577585d5861be24eebd8 ':
cavs: cosmetics, reformat top part
cavsdec: cosmetics, reformat
libavcodec/utils: Add braces to shut up gcc warnings
Conflicts:
libavcodec/cavsdec.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 31 Dec 2012 12:06:29 +0000 (13:06 +0100)]
lavc/textdec: fix subviewer1 preproc check.
Martin Storsjö [Sun, 30 Dec 2012 22:46:14 +0000 (00:46 +0200)]
rtmp: Add support for limelight authentication
Limelight is a not too uncommon CDN. The authentication scheme is
pretty similar to the adobe authentication, but is even closer to
normal http digest authentication (but not close enough to warrant
sharing code) than the adobe version.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 30 Dec 2012 20:39:38 +0000 (22:39 +0200)]
rtmp: Add support for adobe authentication
This is mostly used to authenticate the client when publishing.
Tested with wowza and akamai.
Some but not all servers support resending a new connect invoke
within the same connection, so always reconnect for sending a new
connection attempt. This matches what other applications do as well.
The authentication scheme is structurally pretty similar to http
digest authentication, but uses base64 instead of hex strings.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 30 Dec 2012 20:38:23 +0000 (22:38 +0200)]
rtmp: Add a function for writing AMF strings based on two substrings
This avoids having to concatenate them into one buffer before writing
them as AMF.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 30 Dec 2012 16:53:35 +0000 (18:53 +0200)]
rtmp: Return a proper error code in handle_invoke_error
Signed-off-by: Martin Storsjö <martin@martin.st>
Hendrik Leppkes [Tue, 30 Oct 2012 21:57:37 +0000 (22:57 +0100)]
configure: suppress -fPIC in msvc builds
MSVC doesn't understand the option, and emits a warning on every
call to cl.exe.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Sun, 30 Dec 2012 23:29:36 +0000 (00:29 +0100)]
Drop unnecessary 'l' length modifier when printfing double values.
%f denotes a double argument and 'l' does nothing in this case
according to the C spec.
Diego Biurrun [Sun, 23 Dec 2012 17:43:19 +0000 (18:43 +0100)]
truemotion2: Sanitize tm2_read_header()
Also give a variable a more sensible name.
Clément Bœsch [Mon, 31 Dec 2012 09:08:27 +0000 (10:08 +0100)]
lavc: correctly set AVSubtitle format for text based subtitles.
Clément Bœsch [Mon, 31 Dec 2012 09:06:32 +0000 (10:06 +0100)]
lavc/utils: reindent in avcodec_decode_subtitle2().
Paul B Mahol [Fri, 28 Dec 2012 13:40:55 +0000 (13:40 +0000)]
Sony Wave64 muxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Mon, 31 Dec 2012 01:33:18 +0000 (02:33 +0100)]
Changelog: remove av_{base,dir}_name addition.
This belongs only to APIChanges, where it is already present.
Spotted-by: Stefano
Clément Bœsch [Mon, 31 Dec 2012 00:40:34 +0000 (01:40 +0100)]
lavfi/Makefile: add missing dependencies to FFLIBS.
Clément Bœsch [Mon, 31 Dec 2012 00:38:31 +0000 (01:38 +0100)]
lavfi/Makefile: make FFLIBS list consistent.
Clément Bœsch [Sat, 29 Dec 2012 22:26:36 +0000 (23:26 +0100)]
microdvd: sanitize AVPackets.
Current MicroDVD AVPackets contain timing information and trailing line
breaks. The data is now only composed of the markup data. Doing this
consistently between text subtitles decoders allows to use different
codec for various formats. For instance, MicroDVD markup is sometimes
found in some VPlayer files. Also, generally speaking, the subtitles
text decoders have no use of these timings (and they must not use them
since it would break any user timing adjustment).
Technically, this is a major ABI break. In practice, a mismatching
lavf/lavc will now error out for MicroDVD decoding. Supporting both
formats requires unnecessary complex and fragile code.
FATE needs update because line breaks in the ASS file were "\n" (because
that's what is used in the original file). ASS format expect "\r\n" line
breaks; this commit fixes this issue. Also note that this "\r\n"
trailing need to be moved at some point from the decoders to the ASS
muxer.
Clément Bœsch [Fri, 28 Dec 2012 23:04:44 +0000 (00:04 +0100)]
Add SubViewer v1 subtitles demuxer and decoder.
Clément Bœsch [Fri, 28 Dec 2012 04:15:00 +0000 (05:15 +0100)]
Add PJS subtitles demuxer and decoder.
Clément Bœsch [Sun, 30 Dec 2012 22:42:50 +0000 (23:42 +0100)]
FATE: disable fate-sub-mpsub temporarly.
Sample has been forgotten, revert this commit in a day or two, when
sample is available everywhere.
Clément Bœsch [Fri, 28 Dec 2012 02:49:02 +0000 (03:49 +0100)]
Add AQTitle subtitles demuxer.
Clément Bœsch [Sun, 30 Dec 2012 22:14:34 +0000 (23:14 +0100)]
lavf/subtitles: fix CLRF/CRLF typo.
Clément Bœsch [Fri, 28 Dec 2012 00:38:50 +0000 (01:38 +0100)]
Add MPlayer subtitles demuxer.
Clément Bœsch [Fri, 28 Dec 2012 00:15:01 +0000 (01:15 +0100)]
lavf: move srtdec:read_chunk() to subtitles utils.
This function can be useful for various other subtitles formats.
Clément Bœsch [Sun, 30 Dec 2012 21:54:53 +0000 (22:54 +0100)]
10l: export ff_bprint_to_extradata between libs using avpriv_ prefix.
Both libavformat and libavcodec requires this function.
Clément Bœsch [Thu, 27 Dec 2012 21:36:47 +0000 (22:36 +0100)]
Add VPlayer subtitles demuxer and decoder.
Note that the linebreaks text codec option (but not the feature) has
been removed; its main goal was to allow demuxers to configure the text
decoder (and not meant to be used by users), but the AVOption are not a
viable solution. This is solved differently in this commit.
Clément Bœsch [Thu, 27 Dec 2012 13:49:33 +0000 (14:49 +0100)]
Add MPL2 subtitles demuxer and decoder.
Clément Bœsch [Sun, 30 Dec 2012 21:20:18 +0000 (22:20 +0100)]
lavc/avcodec: fix FF_INPUT_/BUFFER_/PADDING_SIZE typo.
Clément Bœsch [Sun, 30 Dec 2012 21:19:51 +0000 (22:19 +0100)]
ffserver: add missing padding to extradata.
Clément Bœsch [Sat, 29 Dec 2012 21:09:59 +0000 (22:09 +0100)]
lavc: add ff_bprint_to_extradata() helper and use it.
This commit also makes sure the extradata and subtitle_header are NUL
terminated, without taking into account the trailing '\0' in account in
the size.
At the same time, it should fix 'warning: dereferencing type-punned
pointer will break strict-aliasing rules' warning for compilers who
don't consider uint8_t** and char** compatibles.
Clément Bœsch [Sun, 30 Dec 2012 20:34:00 +0000 (21:34 +0100)]
lavc/srtenc: just like the decoder, mark SRT encoder as deprecated.
Clément Bœsch [Sat, 29 Dec 2012 23:56:48 +0000 (00:56 +0100)]
lavc/srtenc: do not add trailing line breaks with SubRip.
The SRT muxer is reponsible for separating events with two line breaks,
there is no need to add more than necessary. Similarly, other muxers
(such as Matroska) are not supposed to add line breaks at the end of the
payload.
Clément Bœsch [Sat, 29 Dec 2012 22:50:56 +0000 (23:50 +0100)]
lavf/srtdec: remove line break hack.
This is not necessary anymore since the last commit.
Clément Bœsch [Sat, 29 Dec 2012 22:50:08 +0000 (23:50 +0100)]
lavc/srtdec: make some sscanf to work at the end of a line.
Fix sscanf calls that can't work at the end of a line unless it ends
with \r\n or \n: the markup line may/should/must not end with these
characters.
Anton Khirnov [Fri, 28 Dec 2012 05:20:01 +0000 (06:20 +0100)]
FATE: add cavs test
Anton Khirnov [Fri, 28 Dec 2012 05:19:12 +0000 (06:19 +0100)]
cavsdec: export picture type in the output frame
Anton Khirnov [Thu, 27 Dec 2012 16:12:10 +0000 (17:12 +0100)]
cavs: deMpegEncContextize
It does not use any of the mpegvideo infrastructure, just a few fields
from the context.
Fixes a segfault with the emu edge flag, since emu edge buffer is now
allocated as a part of the frame buffer allocation and cavs calls
ff_get_buffer() directly, it does not use mpegvideo buffer management.
Fixes a memleak of the last frame.
Anton Khirnov [Thu, 27 Dec 2012 13:16:25 +0000 (14:16 +0100)]
cavs: cosmetics, reformat top part
Anton Khirnov [Thu, 27 Dec 2012 12:57:56 +0000 (13:57 +0100)]
cavsdec: cosmetics, reformat
Nicolas George [Wed, 26 Dec 2012 23:43:12 +0000 (00:43 +0100)]
lavfi/sink_buffer: switch to filter_frame.
Nicolas George [Wed, 26 Dec 2012 23:42:51 +0000 (00:42 +0100)]
lavfi/video: ensure that filter_frame is called.
This is a temporary workaround until all filters have been
upgraded to filter_frame and the framework can forget completely
about start_frame/draw_slice/end_frame.
Don Moir [Sun, 30 Dec 2012 17:21:25 +0000 (17:21 +0000)]
gifdec: use transparent instead of background color index
Wrong code was commited in
64f4fb75c4cea6b33b5fd5b135c19950df9a7154 .
Michael Niedermayer [Sun, 30 Dec 2012 15:59:52 +0000 (16:59 +0100)]
vf_tinterlace: dont mix declarations and expressions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Dec 2012 00:13:42 +0000 (01:13 +0100)]
lavfi: remove some draw_slice related code that has become unneeded
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mark Himsley [Sun, 30 Dec 2012 14:02:16 +0000 (15:02 +0100)]
lavfi/tinterlace: add low-pass-filter for top/bottom interleave modes
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Wed, 26 Dec 2012 00:44:47 +0000 (01:44 +0100)]
doc/filters: drop duplicated description of resampler options in aresample docs
Avoid duplication, and point to the complete description of options.
Also provide a more complete specification of the supported syntax.
Michael Niedermayer [Sun, 30 Dec 2012 13:29:15 +0000 (14:29 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
snow: use VideoDSPContext
Conflicts:
libavcodec/snow.c
Nothing merged here, this has already been fixed in ffmpeg long ago
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Dec 2012 13:21:50 +0000 (14:21 +0100)]
Merge commit '
30a76487304e7250294c9c0e9fa179bf07fd822a '
* commit '
30a76487304e7250294c9c0e9fa179bf07fd822a ':
hlsenc: make segment number unsigned
hlsenc: make EXT-X-MEDIA-SEQUENCE always increase
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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.
Diego Biurrun [Fri, 28 Dec 2012 18:06:04 +0000 (19:06 +0100)]
libavcodec/utils: Add braces to shut up gcc warnings
libavcodec/utils.c:1050:5: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/utils.c:1314:5: warning: missing braces around initializer [-Wmissing-braces]
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 17:05:49 +0000 (18:05 +0100)]
snow: use VideoDSPContext
It was left over from the initial conversion.
Luca Barbato [Sat, 29 Dec 2012 11:31:01 +0000 (12:31 +0100)]
hlsenc: make segment number unsigned
It will overflow if somebody keeps streaming for a time long enough.
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 11:09:17 +0000 (12:09 +0100)]
hlsenc: make EXT-X-MEDIA-SEQUENCE always increase
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>