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
015da965a6
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]
2012-12-30 01:52:04 +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
f18d2137d6
aiffenc: use ff_raw_write_packet()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-28 22:06:39 +00:00
8ad010a7e0
soxenc: use ff_raw_write_packet()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-28 21:58:03 +00:00
a4b62f36c7
soxdec: use meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-28 21:50:42 +00:00
09401694db
soxenc: use ffio_fill
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-28 21:48:07 +00:00
a4912aa61e
soxenc: use FFALIGN
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-28 21:37:08 +00:00
07abf13da4
h264: avoid a grayscale related if() in hl_decode_mb()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-28 21:01:54 +01:00
92b50b71a1
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>
2012-12-28 20:01:01 +01:00
ec89ea3022
ffplay: always display audio visualization if mode is set
...
Fixes ticket #1903 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2012-12-28 20:01:01 +01:00
ef7f3b0870
ffplay: hide cursor on no mouse movement
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2012-12-28 20:01:00 +01:00
0ca4e9f014
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>
2012-12-28 20:01:00 +01:00
4e33d8ebb3
ffplay: only drop frames if not in frame step mode
...
Fixes ticket #2053 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2012-12-28 20:00:07 +01:00
97660b8b13
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>
2012-12-28 19:59:46 +01:00
c73c87b412
cosmetics: Prettyprint codec/format/filter registration files
2012-12-28 19:18:13 +01:00
69583bd3b1
avfilter: Refactor unconditional filter registration
2012-12-28 19:18:13 +01:00
Michael Niedermayer
Clément Bœsch
Diego Biurrun
Dave Yeo
James Almer
Luca Barbato
Kanglin
Paul B Mahol
Marton Balint