]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 25 Jun 2013 09:26:59 +0000 (11:26 +0200)]
Merge commit '
b6507930ac1898aed62ab0b56afc7d6734ad830b '
* commit '
b6507930ac1898aed62ab0b56afc7d6734ad830b ':
fate: Add Canopus Lossless YUY2 test
Conflicts:
tests/fate/lossless-video.mak
tests/ref/fate/cllc-yuy2-noblock
No change as the change is already in master
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Mon, 24 Jun 2013 22:38:54 +0000 (18:38 -0400)]
fate: Add Canopus Lossless YUY2 test
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 25 Jun 2013 08:51:19 +0000 (10:51 +0200)]
Merge commit '
d9c89ef86b9400e50c2486f9406fad15c85bab22 '
* commit '
d9c89ef86b9400e50c2486f9406fad15c85bab22 ':
cllc: Use outbuf in RGB and ARGB functions
cllc: Implement YUV support
Conflicts:
libavcodec/cllc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 25 Jun 2013 08:46:52 +0000 (10:46 +0200)]
Merge commit '
b0ce601c160c87349d093d7e542b5c752754f598 '
* commit '
b0ce601c160c87349d093d7e542b5c752754f598 ':
doc/platform: Add info about ICL
Conflicts:
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Mon, 24 Jun 2013 23:13:58 +0000 (19:13 -0400)]
yuv4mpeg: correctly handle chroma for odd luma sizes.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 24 Jun 2013 22:26:08 +0000 (18:26 -0400)]
fate: Add Canopus Lossless YUY2 test
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Matthew Heaney [Mon, 24 Jun 2013 18:20:32 +0000 (11:20 -0700)]
lavf/webvttdec: use private option to specify WebVTT kind
WebVTT subtitle tracks have four kinds. Certain downstream muxers
(such as for WebM) need to know which WebVTT kind this is, in order to
specify the codec id of the output track.
A new private input option, "-kind", has been added to the WebVTT
demuxer. It accepts as a value any of "subtitles" (the default),
"captions", "descriptions", and "metadata". The kind option value is
used to assign a value to the stream disposition flag, to which four
new values have been added, corresponding the four WebVTT kinds.
Signed-off-by: Matthew Heaney <matthewjheaney@google.com>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Matthew Heaney [Mon, 24 Jun 2013 18:18:05 +0000 (11:18 -0700)]
lavf: add AV_DISPOSITION flags for WebVTT text track kinds
There are 4 separate WebVTT text track kinds: subtitles (the default
if not otherwise specified), captions, descriptions, and metadata.
The WebM muxer needs to know which WebVTT text track kind this is, in
order to synthesize the correct track type and codec id.
To allow a demuxer to indicate the text track kind of the input, a new
set of AV_DISPOSITION flag values has been added, corresponding to
each of the non-default text track kind values.
Derek Buitenhuis [Mon, 24 Jun 2013 18:12:16 +0000 (14:12 -0400)]
cllc: Use outbuf in RGB and ARGB functions
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 23 Jun 2013 23:29:38 +0000 (19:29 -0400)]
cllc: Implement YUV support
Fixes ticket #1910.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Mon, 24 Jun 2013 21:21:17 +0000 (23:21 +0200)]
avfilter/vsrc_testsrc: fix artifacts with odd height
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Mon, 24 Jun 2013 18:12:16 +0000 (14:12 -0400)]
cllc: Use outbuf in RGB and ARGB functions
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 23 Jun 2013 23:29:38 +0000 (19:29 -0400)]
cllc: Implement YUV support
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 23 Jun 2013 23:49:28 +0000 (19:49 -0400)]
doc/platform: Add info about ICL
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Mon, 24 Jun 2013 14:05:19 +0000 (16:05 +0200)]
h264: Fix null pointer dereference with disabled error concealment
Fixes Ticket2551
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Jun 2013 12:23:44 +0000 (14:23 +0200)]
avformat/avio: Fix EOF handiling of ffurl_read_complete()
Fixes Ticket2537
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Jun 2013 09:42:42 +0000 (11:42 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: don't abort if both encoder and muxer aspect ratios are not set
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Jun 2013 09:11:27 +0000 (11:11 +0200)]
Merge commit '
c3e58f8fb75d8467161a65b85eb88281547ebab1 '
* commit '
c3e58f8fb75d8467161a65b85eb88281547ebab1 ':
matroskaenc: restore compatibility with non referenced AVPacket
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Jun 2013 08:57:04 +0000 (10:57 +0200)]
Merge commit '
95d52464542f532061290192518d5fe1c1930e8d '
* commit '
95d52464542f532061290192518d5fe1c1930e8d ':
lavc: Add option to encode MPEG-2 AAC with libfdk-aac
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Jun 2013 08:40:15 +0000 (10:40 +0200)]
Merge commit '
ace87c19ed4c4882d7b9b3ce512c4c195e39a203 '
* commit '
ace87c19ed4c4882d7b9b3ce512c4c195e39a203 ':
configure: whitespace cosmetics
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Jun 2013 08:16:03 +0000 (10:16 +0200)]
Merge commit '
6dc6598692da3b0ebda2d768681786343f26a4f4 '
* commit '
6dc6598692da3b0ebda2d768681786343f26a4f4 ':
configure: Simplify an expression with enabled_all.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Rafaël Carré [Sun, 23 Jun 2013 21:00:34 +0000 (23:00 +0200)]
lavf: don't abort if both encoder and muxer aspect ratios are not set
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Rafaël Carré [Sun, 23 Jun 2013 21:00:33 +0000 (23:00 +0200)]
matroskaenc: restore compatibility with non referenced AVPacket
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Kieran Kunhya [Sat, 22 Jun 2013 15:16:11 +0000 (10:16 -0500)]
lavc: Add option to encode MPEG-2 AAC with libfdk-aac
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Mon, 24 Jun 2013 01:44:30 +0000 (03:44 +0200)]
msmpeg4: Fix ff_msmpeg4_pred_dc() so it works with lowres>0
Fixes Ticket2532
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Jun 2013 00:58:28 +0000 (02:58 +0200)]
cmdutils: dont change the log level for -report
Fixes Ticket2476
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Jun 2013 17:45:39 +0000 (19:45 +0200)]
sonic: use av_freep() as its safer than av_free()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Jun 2013 17:44:24 +0000 (19:44 +0200)]
sonic: cleanup/simplify num_taps check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Jun 2013 17:42:24 +0000 (19:42 +0200)]
sonic: replace divide() by ROUNDED_DIV()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 23 Jun 2013 04:16:11 +0000 (21:16 -0700)]
vp8: wait for prev_frame to parse segment_map before reading it.
This fixes occasional failures of vp8-test-vector-010 with frame-level
multithreading enabled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Jun 2013 11:45:39 +0000 (13:45 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: More msvc/icl combining
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Jun 2013 11:21:21 +0000 (13:21 +0200)]
Merge commit '
f963f701d90bd7bb03e39aab4e59bd137084e082 '
* commit '
f963f701d90bd7bb03e39aab4e59bd137084e082 ':
ogg: relax demuxer conformance checks
Conflicts:
libavformat/oggdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Jun 2013 10:56:48 +0000 (12:56 +0200)]
Merge commit '
42cc6cefd315c1556e2a52f7ebe2f766ec82b790 '
* commit '
42cc6cefd315c1556e2a52f7ebe2f766ec82b790 ':
avconv: report the error for codec open failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Jun 2013 10:45:15 +0000 (12:45 +0200)]
Merge commit '
1e340af8d6a97cc013a2ad8ba77c77129625a34f '
* commit '
1e340af8d6a97cc013a2ad8ba77c77129625a34f ':
avconv: drop additional strerror fallback
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 20 Jun 2013 11:42:21 +0000 (13:42 +0200)]
configure: whitespace cosmetics
Diego Biurrun [Thu, 20 Jun 2013 11:42:20 +0000 (13:42 +0200)]
configure: Simplify an expression with enabled_all.
Michael Niedermayer [Sat, 22 Jun 2013 23:25:55 +0000 (01:25 +0200)]
sonic: avoid float sqrt() for integer input & output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Jun 2013 23:22:26 +0000 (01:22 +0200)]
sonic: simplify quant cliping
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Jun 2013 20:34:32 +0000 (22:34 +0200)]
sonic: use av_calloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Smith [Wed, 19 Jun 2013 21:07:49 +0000 (21:07 +0000)]
configure: More msvc/icl combining
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Oka Motofumi [Fri, 21 Jun 2013 13:57:03 +0000 (22:57 +0900)]
avisynth: Make sure the filename passed to Avisynth is in the right code page
Avisynth is a non-unicode application and cannot accept UTF-8
characters. Therefore, the input filename should be converted to
the code page that it expects.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sat, 20 Apr 2013 21:54:51 +0000 (17:54 -0400)]
configure: Enable MinGW-w64's implementation of vsnprintf and pals
As of r5799 in MinGW-w64's trunk, which is he upcoming major version 3,
the POSIX-compliant vsnprintf implementation is disabled by default.
Enable it for this version. Keep using out own implementation for
prior versions, because it is broken in them.
Relevant Reference Thread: http://article.gmane.org/gmane.comp.gnu.mingw.w64.general/7133
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Sat, 22 Jun 2013 20:04:00 +0000 (22:04 +0200)]
sonic: replace literal numbers by sizeof()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Jun 2013 19:58:13 +0000 (21:58 +0200)]
sonic: replace some float by integers to improve platform independance
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Jun 2013 19:42:04 +0000 (21:42 +0200)]
sonic: Improve error codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Jun 2013 19:34:11 +0000 (21:34 +0200)]
sonic: simplify shift_down()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Thu, 20 Jun 2013 09:36:04 +0000 (11:36 +0200)]
ogg: relax demuxer conformance checks
Some samples in the wild are missing headers that are expected by the
specification but in practice do not affect decoding.
Luca Barbato [Wed, 19 Jun 2013 22:06:08 +0000 (00:06 +0200)]
avconv: report the error for codec open failure
External codec may have corner case reason to fail at init, better
report them instead having the user wonder.
Luca Barbato [Fri, 21 Jun 2013 10:47:01 +0000 (12:47 +0200)]
avconv: drop additional strerror fallback
strerror_r is called by av_strerror already.
Michael Niedermayer [Sat, 22 Jun 2013 12:50:37 +0000 (14:50 +0200)]
avutil/ripemd: adjust loop condition to silence CID1035716
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Fri, 21 Jun 2013 19:56:18 +0000 (21:56 +0200)]
smvjpeg: use refcounted frames to avoid mem leaks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Fri, 21 Jun 2013 17:51:39 +0000 (19:51 +0200)]
smvjpeg: remove redundant frame init code
avctx->coded_frame is not used for decoders anymore,
and av_frame_alloc does all the frame initialization required.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Fri, 21 Jun 2013 16:10:38 +0000 (18:10 +0200)]
swscale: fix filter alignment reduction without inline asm
Fixes scaling in MSVC/ICL, where inline asm is not present, but the
YASM scaling code is.
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Jun 2013 17:39:45 +0000 (19:39 +0200)]
h264: fix size of arrays in ff_h264_check_intra_pred_mode()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Jun 2013 17:51:30 +0000 (19:51 +0200)]
h264/ff_h264_check_intra_pred_mode: fix input value check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 21 Jun 2013 16:20:05 +0000 (18:20 +0200)]
doc/decoders,decoders: add various missing final dots
Enhance consistency.
Timothy Gu [Fri, 21 Jun 2013 16:17:21 +0000 (18:17 +0200)]
doc/decoders: Add libopencore-amrwb decoder doc
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Fri, 21 Jun 2013 15:40:54 +0000 (17:40 +0200)]
doc/protocols: apply very minor consistency fixes
Andrey Utkin [Wed, 19 Jun 2013 05:21:00 +0000 (08:21 +0300)]
doc/protocols: document "srtp" protocol
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Hendrik Leppkes [Sat, 15 Jun 2013 20:46:01 +0000 (22:46 +0200)]
mathops/x86: work around inline asm miscompilation with GCC 4.8.1
The volatile is not required here, and prevents a miscompilation with GCC
4.8.1 when building on x86 with --cpu=i686
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 21 Jun 2013 03:08:35 +0000 (20:08 -0700)]
doc/decoders: Document libopencore-amrnb decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Jun 2013 18:20:56 +0000 (20:20 +0200)]
avdevice/x11grab: allocate just one Cursor
Fixes resource leak and Ticket2450
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Jun 2013 08:49:42 +0000 (10:49 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: free the padded last frame during audio encoding properly
See:
7fff3df6b277d4f1ebc504e950c9de56cdc14ddd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Jun 2013 08:41:41 +0000 (10:41 +0200)]
Merge commit '
eeeb5c291d3f78eaade5b99c2614c7cab0e9be79 '
* commit '
eeeb5c291d3f78eaade5b99c2614c7cab0e9be79 ':
vsrc_movie: do not free avoption variables in uninit()
Conflicts:
libavfilter/src_movie.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Thu, 20 Jun 2013 23:33:49 +0000 (16:33 -0700)]
doc/decoders: Document libilbc decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Jun 2013 01:22:02 +0000 (03:22 +0200)]
avcodec/utvideodec: Fix vlc len
Fixes regression / Ticket2661
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Jun 2013 22:32:00 +0000 (00:32 +0200)]
bytestream2_init: assert that buf_size is valid
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Jun 2013 22:31:00 +0000 (00:31 +0200)]
avcodec/jpeg2000dec: check that tp_end is after the start
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Jun 2013 19:49:02 +0000 (21:49 +0200)]
avformat/iff: Byte seek is unsupported
Fixes Ticket2194
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 18 Jun 2013 09:41:04 +0000 (11:41 +0200)]
lavc: free the padded last frame during audio encoding properly
Michael Niedermayer [Tue, 18 Jun 2013 15:55:50 +0000 (17:55 +0200)]
avformat/libmodplug: Reduce the probe score for small input
This ensures that theres enough data for mpeg_probe() to recognize mpeg-ps
Fixes Ticket2583
Based on code by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Wed, 19 Jun 2013 05:20:13 +0000 (08:20 +0300)]
Document "sctp" protocol
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 20 Jun 2013 11:27:14 +0000 (13:27 +0200)]
vsrc_movie: do not free avoption variables in uninit()
The generic code frees them as well. Since av_free was used to free them
instead of av_freep, this would result in a double free.
Michael Niedermayer [Thu, 20 Jun 2013 08:29:05 +0000 (10:29 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Remove unneeded icl inline compatibility definition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Wed, 19 Jun 2013 05:17:58 +0000 (08:17 +0300)]
Document "crypto" protocol
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Tue, 18 Jun 2013 23:01:43 +0000 (16:01 -0700)]
doc/decoders: Document libgsm decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Jun 2013 20:13:29 +0000 (22:13 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Autodetect idcin only if audio properties allow decoding.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Jean Delvare [Wed, 19 Jun 2013 14:07:09 +0000 (16:07 +0200)]
delogo: Fix function description
The algorithm works on src and writes to dst, not the other way
around.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 19 Jun 2013 14:31:10 +0000 (16:31 +0200)]
Autodetect idcin only if audio properties allow decoding.
Fixes ticket #2688.
Compn [Wed, 19 Jun 2013 14:43:48 +0000 (10:43 -0400)]
isom: add xd51 hdcam , someone needs to binary search FCP for new isom...
Michael Niedermayer [Wed, 19 Jun 2013 08:06:38 +0000 (10:06 +0200)]
sonicenc: fix off by 1 error
Fixes out of array accesses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Jun 2013 08:06:10 +0000 (10:06 +0200)]
sonicenc: dont put multiple assignments per line
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Smith [Wed, 19 Jun 2013 00:39:47 +0000 (20:39 -0400)]
configure: Remove unneeded icl inline compatibility definition
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 19 Jun 2013 07:50:01 +0000 (09:50 +0200)]
sonicenc: set supported samples formats array
This ensures that only supported formats are input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Jun 2013 06:27:35 +0000 (08:27 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()
Conflicts:
libavfilter/audio.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Tue, 18 Jun 2013 00:38:38 +0000 (17:38 -0700)]
doc/encoders: Add libopencore-amrnb doc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Jun 2013 23:25:32 +0000 (01:25 +0200)]
Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mark Visser [Tue, 18 Jun 2013 21:38:17 +0000 (17:38 -0400)]
add the start_number offset to var_values[VAR_N] directly, instead of adding it in func_frame_num
Michael Niedermayer [Tue, 18 Jun 2013 18:50:15 +0000 (20:50 +0200)]
ff_gen_search: fix infinite loop
Fixes Ticket2639
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Jun 2013 18:48:53 +0000 (20:48 +0200)]
ff_gen_search: fix limit
The limit value could become slightly wrong in the last iteration
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Jun 2013 18:47:07 +0000 (20:47 +0200)]
ff_gen_search: make step 64it to prevent hypothetical integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Tue, 18 Jun 2013 00:42:08 +0000 (17:42 -0700)]
doc/decoders: Document libcelt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthew Heaney [Mon, 17 Jun 2013 23:29:13 +0000 (16:29 -0700)]
Add maintainer for WebVTT demuxer and muxer
Matthew J Heaney is added to the list of ffmpeg maintainers, for the
WebVTT demuxer and muxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Jun 2013 14:39:23 +0000 (16:39 +0200)]
avutil/frame: Try to align width to achive linesize[0] alignment
This results in more alignment for pixel formats that have "odd" pixel
sizes like RGB24. It makes access through SIMD easier
Works around Issue described in Ticket1031
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 29 May 2013 19:03:20 +0000 (21:03 +0200)]
lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()
This simplifies the code and avoids using libavcodec-specific
avcodec_fill_audio_frame().
Michael Niedermayer [Tue, 18 Jun 2013 07:29:35 +0000 (09:29 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: math typo in interlace filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Jun 2013 00:09:46 +0000 (02:09 +0200)]
swresample/x86/audio_convert: add emms to CONV
Might fix Ticket1874
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Mon, 17 Jun 2013 23:56:06 +0000 (01:56 +0200)]
vaapi: return early from ff_vaapi_render_picture() without picture
Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461.
Tested-by: Timo
Reviewed-by: Joakim Plate
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Carl Eugen Hoyos [Mon, 17 Jun 2013 23:54:30 +0000 (01:54 +0200)]
Revert "vaapi: return early from ff_vaapi_render_picture() without picture"
This reverts commit
4cbf245f2a2cd2170ca30b0788c2af5b506fe6d6 .
I messed up the author information.
Carl Eugen Hoyos [Mon, 17 Jun 2013 22:21:09 +0000 (00:21 +0200)]
vaapi: return early from ff_vaapi_render_picture() without picture
Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461.
Tested-by: Timo
Reviewed-by: Joakim Plate