e911f4ae72
lavc/srtenc: just like the decoder, mark SRT encoder as deprecated.
2012-12-30 21:39:36 +01:00
1b673cd9ff
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.
2012-12-30 21:39:36 +01:00
3af3a3006f
lavf/srtdec: remove line break hack.
...
This is not necessary anymore since the last commit.
2012-12-30 21:39:35 +01:00
d927d8395d
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.
2012-12-30 21:39:35 +01:00
c36302a7a4
lavfi/sink_buffer: switch to filter_frame.
2012-12-30 18:29:57 +01:00
a978c04e22
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.
2012-12-30 18:29:57 +01:00
522cb6abf2
gifdec: use transparent instead of background color index
...
Wrong code was commited in 64f4fb75c4
2012-12-30 17:21:25 +00:00
b84871b8eb
vf_tinterlace: dont mix declarations and expressions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-30 16:59:52 +01:00
c0c0b19644
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>
2012-12-30 16:58:50 +01:00
8997a0fa79
lavfi/tinterlace: add low-pass-filter for top/bottom interleave modes
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-12-30 15:19:23 +01:00
9e3b6285cb
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.
2012-12-30 15:04:58 +01:00
cbed2426a0
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>
2012-12-30 14:51:06 +01:00
384dd9804d
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>
2012-12-30 14:21:55 +01:00
56c71cd599
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>
2012-12-30 14:11:17 +01:00
19e1c8e4f2
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>
2012-12-30 14:02:19 +01:00
2ce43b37fc
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>
2012-12-30 13:54:50 +01:00
613001d75f
Merge back some registering macros in all*.c.
...
This breaks the sed in configure:find_things(). Fixes regression from
c73c87b
2012-12-30 07:18:21 +01:00
c83002a4f8
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.
2012-12-30 06:57:34 +01:00
b113d4a83c
aacdec: make dual mono mode selectable through AVOptions too.
...
Based on patch by Akihiro Tsukada
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-30 05:29:17 +01:00
644f021ccf
aacdec: simplify dmono
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-30 05:29:17 +01:00
6d38661920
aacdec: fix dual mono
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-30 05:29:17 +01:00
518239cd61
build: postproc cleanup.
...
This reverts 79f80f5c
2012-12-30 02:27:52 +01:00
c77eb4ee90
sws: fix warning: cast from pointer to integer of different size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 20:50:43 +01:00
3cd137bfea
vf_deshake: fix strict aliassing errors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 20:00:48 +01:00
aa9507cc3d
swscale: fix warning: assignment from incompatible pointer type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 19:39:42 +01:00
05d81a57f5
motion_est_template: fix warning: "ASSERT_LEVEL" is not defined
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 19:37:20 +01:00
4f1d7cc0ed
bktr: fix warning: missing braces around initializer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 19:27:07 +01:00
925c9f444f
Fix OS/2 threading
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 18:56:33 +01:00
53228f47d6
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>
2012-12-29 18:56:33 +01:00
d59d39e164
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>
2012-12-29 17:46:01 +00:00
d615da60c1
snow: use VideoDSPContext
...
It was left over from the initial conversion.
2012-12-29 18:05:49 +01:00
30a7648730
hlsenc: make segment number unsigned
...
It will overflow if somebody keeps streaming for a time long enough.
2012-12-29 17:26:30 +01:00
9b1370aced
hlsenc: do not add timestamps in different timebases
...
start_time is in stream timebase units while end_time is
in AV_TIME_BASE ones.
2012-12-29 17:26:30 +01:00
0448f26c97
hlsenc: keep the playlist to the correct number of items
...
Consider the corner case with a list size larger than the wrap
number.
2012-12-29 17:26:30 +01:00
27a15e0af6
hlsenc: make EXT-X-MEDIA-SEQUENCE always increase
2012-12-29 17:26:30 +01:00
0d8cc7a3b2
hlsenc: use the correct AV_TIME_BASE macro
...
recording_time is in AV_TIME_BASE units.
2012-12-29 17:26:30 +01:00
6dd93ee6f1
hlsenc: check append_entry return value
2012-12-29 17:26:29 +01:00
ae85d6c9c0
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.
2012-12-29 17:26:29 +01:00
66f7b4862f
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.
2012-12-29 17:26:29 +01:00
d8fd06c37d
avstring: add av_basename and av_dirname
...
Thread safe version of the common basename and dirname.
2012-12-29 17:26:22 +01:00
981baf742c
lavfi: replace REGISTER_BUILTIN_FILTER() by REGISTER_FILTER_UNCONDITIONAL()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 15:37:05 +01:00
83d4a8442c
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>
2012-12-29 14:27:38 +01:00
2a9443a110
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>
2012-12-29 13:05:37 +01:00
ba34e56c0d
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>
2012-12-29 04:34:27 +01:00
c5bea1b02b
xtea: fix unused variable warning for config_small
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 03:37:46 +01:00
e0a99d5411
msmpeg4enc: fix possible use of uninitialized warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 03:07:45 +01:00
2fbc8ea08e
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>
2012-12-29 03:07:45 +01:00
30872fa09b
ivi_common: Fix use of uninitialized warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 03:07:45 +01:00
76e65a1b73
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>
2012-12-29 03:07:45 +01:00
3f8ee30e63
mmfenc: use ff_raw_write_packet()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-28 22:21:56 +00:00
Clément Bœsch