OSDN Git Service
Michael Niedermayer [Wed, 10 Jul 2013 01:13:06 +0000 (03:13 +0200)]
Update back for git master
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jul 2013 00:47:10 +0000 (02:47 +0200)]
Changelog: replace next by 2.0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 23:52:51 +0000 (01:52 +0200)]
Update for 2.0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Mon, 8 Jul 2013 23:03:13 +0000 (01:03 +0200)]
atrac3: fix error handling
decode_tonal_components returns a proper AVERROR.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Eugene Dzhurinsky [Sat, 6 Jul 2013 00:27:56 +0000 (20:27 -0400)]
avformat/gif: Do not write GIF89a header if loop is set to -1.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 22:57:00 +0000 (00:57 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: assume 0 stream start time if start time is unset in duration check
ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 22:47:01 +0000 (00:47 +0200)]
MAINTAINERS: Update which releases are supported
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexis Ballier [Tue, 9 Jul 2013 19:10:16 +0000 (15:10 -0400)]
codec_desc: fix typo in rv20 long_name.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 22:24:04 +0000 (00:24 +0200)]
doc/RELEASE_NOTES: add a note about AVISynth
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 21:46:29 +0000 (23:46 +0200)]
jpegdec: clear EOBRUN on restarts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 21:45:31 +0000 (23:45 +0200)]
jpegdec: give handle_rstn() a return code that indicates if restart did happen
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 21:43:36 +0000 (23:43 +0200)]
mjpeg_decode_scan: reset restart state
Fixes Ticket2082
Fixes progressive/refinement + restart jpegs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 19:42:27 +0000 (21:42 +0200)]
doc/ffmpeg: document -override_ffserver
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 19:10:45 +0000 (21:10 +0200)]
snowenc: check minimum resolution
Fixes Ticket1855
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sun, 7 Jul 2013 00:54:22 +0000 (02:54 +0200)]
ffplay: assume 0 stream start time if start time is unset in duration check
Fixes ticket #2103 and #2743.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 6 Jul 2013 18:47:12 +0000 (20:47 +0200)]
ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE
Signed-off-by: Marton Balint <cus@passwd.hu>
Piotr Bandurski [Tue, 9 Jul 2013 17:29:26 +0000 (19:29 +0200)]
bitstream: fix a crash in case of oom
fixes ticket #2766
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 9 Jul 2013 05:39:10 +0000 (02:39 -0300)]
vorbiscomment: Add support for embedded cover art
Fixes ticket #2655
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 9 Jul 2013 05:39:09 +0000 (02:39 -0300)]
lavf/flacdec: Share the function to parse cover art blocks
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 16:34:01 +0000 (18:34 +0200)]
avformat/AVFormatContext: Move fields down to match the fork
avconv uses private and internal fields from libavformat, we thus must
match the layout even of the fields marked non public.
Otherwise ffmpegs libavformat could not be used as a dropin replacement
on debian/ubuntu
The current soname of libavformat was not part of any release nor are any
fields marked public moved thus in theory
no installed shared lib ABI breakage should occur. Still the need for this
change is unfortunate and chilling.
If you installed shared libs from a recent development version of libavformat
that is more recent than the last release. You probably want to check or rebuild
applications that linked to it.
minor versions of avformat & avdevice are bumped to allow detecting this
as both use the updated struct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 16:10:33 +0000 (18:10 +0200)]
avfilter/graphparse: Fix build with --enable-incompatible-fork-abi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 8 Jul 2013 18:55:08 +0000 (18:55 +0000)]
lavfi/drawtext: add support for printing frame metadata
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Luca Barbato [Tue, 9 Jul 2013 07:19:30 +0000 (09:19 +0200)]
imc: Catch a division by zero
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Kostya Shishkov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 12:01:13 +0000 (14:01 +0200)]
avcodec/wmaprodec: Check block_align
Fixes undefined behavior
Its not known if this condition can be triggered through crafted input.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 11:04:46 +0000 (13:04 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Force correct extradata for AVID AVCI50 in mov.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 09:19:27 +0000 (11:19 +0200)]
ff_lpc_calc_coefs: assert that the type is levinson or cholesky
Otherwise the code could misbehave (and there are no other types anyway)
Fixes CID700759
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 9 Jul 2013 08:19:21 +0000 (10:19 +0200)]
Force correct extradata for AVID AVCI50 in mov.
Fixes ticket #2106.
Reviewed-by: Kieran Kunhya
Paul B Mahol [Tue, 9 Jul 2013 09:38:47 +0000 (09:38 +0000)]
lavfi/psnr: rename 's' parameter to match documentation
Also removes some irrelevant lines in documentation.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 9 Jul 2013 08:54:40 +0000 (10:54 +0200)]
ffmpeg_opt: do not warn about unused gop_timecode
The option is injected by generic code and being sometimes unused is normal.
Fixes Ticket2762
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 08:07:01 +0000 (10:07 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Rename the timestamp parameter to dts in write_hint_packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 07:59:29 +0000 (09:59 +0200)]
Merge commit '
a87a0acf9b5d27aad032e61eef4973e62a4a6830'
* commit '
a87a0acf9b5d27aad032e61eef4973e62a4a6830':
movenc: Make sure the RTP hint tracks have nondecreasing DTS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 03:21:26 +0000 (05:21 +0200)]
avcodec/h264_ps: try to support Ambarella AVC
Fixes Ticket2763
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthew Heaney [Mon, 8 Jul 2013 23:25:30 +0000 (16:25 -0700)]
WebM muxer writes WebVTT subtitle track
The Matroska muxer now allows WebVTT subtitle tracks to be written
while in WebM muxing mode.
WebVTT subtitle tracks have four kinds: "subtitles", "captions",
"descriptions", and "metadata". Each text track kind has a distinct
Mastroska CodecID and track type, as described in the temporal
metadata guidelines here:
http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm
When the stream has codec id AV_CODEC_ID_WEBVTT, the stream packet is
serialized per the temporal metadata guidelines cited above. The
WebVTT cue is written as a Matroska block group. The block frame
comprises the WebVTT cue id, followed by the cue settings, followed by
the cue text. (The block timestamp is synthesized from the cue
timestamp.)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 00:57:05 +0000 (02:57 +0200)]
avcodec/libvpxenc: make class names unique
This should fix an infinite loop with -h full
Found-by: <Foofie>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 23:48:29 +0000 (01:48 +0200)]
ffmpeg: Allow overriding ffservers input
Fixes Ticket1970
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 23:40:11 +0000 (01:40 +0200)]
ffmpeg: move creation_time for ffserver setting up
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 8 Jul 2013 20:13:14 +0000 (20:13 +0000)]
lavfi: fix broken logic in metadata handling
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 8 Jul 2013 19:46:20 +0000 (21:46 +0200)]
mpeg12dec: avoid reinitializtation on PS changes when possible.
Fixes Ticket2574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 17:30:37 +0000 (19:30 +0200)]
tests/fate/filter-audio: update asyncts reference
The new reference matches the one used by qatar
Fixes: fate-filter-asyncts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 8 Jul 2013 15:12:11 +0000 (15:12 +0000)]
lavfi/rotate: switch to new drawutils
Get rid of ugly hacks, also add support for more pixel formats.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 8 Jul 2013 15:17:33 +0000 (15:17 +0000)]
lavfi/drawutils: fix planar rgb
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 8 Jul 2013 15:33:40 +0000 (15:33 +0000)]
lavfi/pad: use FFSIGN
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Alexandre Sicard [Mon, 8 Jul 2013 09:56:40 +0000 (11:56 +0200)]
avformat/mov: read stream bitrates from isml manifest
This allows to read a live isml movie and segment it using the
smoothstreaming muxer, which requires the bitrates to be known for each stream.
Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 11:15:32 +0000 (13:15 +0200)]
mp3dec: detect CBR and use CBR axiom to seek
This should also work reasonable with truncated and growing mp3s.
Fixes Ticket2590
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 6 Jul 2013 00:21:12 +0000 (00:21 +0000)]
lavfi: add psnr filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 6 Jul 2013 00:37:28 +0000 (02:37 +0200)]
swscale: treat gray as a fullrage (0-255) format
Fixes Ticket2684
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 7 Jul 2013 22:34:58 +0000 (00:34 +0200)]
Check the return value of ff_rv34_decode_init() in rv30.c and rv40.c
Avoids possible null pointer dereferences on oom.
Fixes ticket #2727.
Martin Storsjö [Sun, 7 Jul 2013 14:03:00 +0000 (17:03 +0300)]
movenc: Rename the timestamp parameter to dts in write_hint_packets
This matches its actual intended use better.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 7 Jul 2013 13:55:26 +0000 (16:55 +0300)]
movenc: Make sure the RTP hint tracks have nondecreasing DTS
The RTP timestamps can be decreasing for codecs with B-frames. For
these cases, make sure the timestamps in the MP4 file track itself
are nondecreasing, and add an offset to the RTP packet hint instead
to produce the intended RTP timestamp.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 8 Jul 2013 09:10:02 +0000 (11:10 +0200)]
cmdutils: replace exit() by exit_program()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 09:09:42 +0000 (11:09 +0200)]
ffmpeg_opt: replace exit() by exit_program()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 09:09:22 +0000 (11:09 +0200)]
ffmpeg_filter: replace exit() by exit_program()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 03:15:10 +0000 (05:15 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
qdm2: check and reset dithering index per channel
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 03:10:06 +0000 (05:10 +0200)]
Merge commit '
76efedeadb1f6bf79020c44a71dd0cee13d932ad'
* commit '
76efedeadb1f6bf79020c44a71dd0cee13d932ad':
qdm2: formatting cosmetics
Conflicts:
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 03:02:52 +0000 (05:02 +0200)]
Merge commit '
f054e309c58894450a5d18cce9799ef58aab9f14'
* commit '
f054e309c58894450a5d18cce9799ef58aab9f14':
qdm2: use init_static_data
westwood_vqa: do not free extradata on error in read_header
Conflicts:
libavformat/westwood_vqa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 02:48:39 +0000 (04:48 +0200)]
Merge commit '
c4abc9098cacb227dba39bac6aea16b2bceba0d0'
* commit '
c4abc9098cacb227dba39bac6aea16b2bceba0d0':
vqavideo: check the version
Conflicts:
libavcodec/vqavideo.c
See:
b226af39107f09cd650875388250f4968eea54db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 02:34:11 +0000 (04:34 +0200)]
Merge commit '
636ced8e1dc8248a1353b416240b93d70ad03edb'
* commit '
636ced8e1dc8248a1353b416240b93d70ad03edb':
cmdutils: wrap exit explicitly
Conflicts:
avprobe.c
cmdutils.c
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 02:08:07 +0000 (04:08 +0200)]
Merge commit '
21732063a346475eb22c332b27e8216b79f9ad4a'
* commit '
21732063a346475eb22c332b27e8216b79f9ad4a':
movenc: K&R formatting cosmetics
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 01:41:33 +0000 (03:41 +0200)]
Merge commit '
38e9585de993c32899588ab037180f2c930ce74c'
* commit '
38e9585de993c32899588ab037180f2c930ce74c':
Makefile: Remove stray tabs
vp8: Wait for prev_frame to parse segment_map before reading it
yuv4mpeg: Correctly round chroma up for odd luma sizes
rmdec: Use the AVIOContext given as parameter in rm_read_metadata()
avio: Handle AVERROR_EOF in the same way as the return value 0
Conflicts:
libavformat/rmdec.c
libavformat/yuv4mpeg.c
No change as all the commits where already in before
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 00:19:28 +0000 (02:19 +0200)]
avformat_find_stream_info: fallback to timestamps in analyzeduration check in more cases
This fixes speex in rtmp
Fixes Ticket2409
the nellymoser in flv case actually needs larger analyzeduration. The code
previously just failed to calculate the duration
If this causes any problems, like premature analyze/probe end, please report!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 7 Jul 2013 23:50:54 +0000 (23:50 +0000)]
zmbvenc: remove unused AVFrame from encoder private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 7 Jul 2013 23:45:17 +0000 (23:45 +0000)]
zmbvenc: do not set avctx->coded_frame
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 7 Jul 2013 23:06:06 +0000 (23:06 +0000)]
gif: remove unused AVFrame from encoder private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 7 Jul 2013 22:56:21 +0000 (22:56 +0000)]
gif: do not set avctx->coded_frame
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Luca Barbato [Thu, 27 Jun 2013 00:50:52 +0000 (02:50 +0200)]
qdm2: check and reset dithering index per channel
Checking per subband would have the index exceed the
dithering noise table size.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Thu, 27 Jun 2013 00:49:15 +0000 (02:49 +0200)]
qdm2: formatting cosmetics
Apply the usual style plus drop few unnecessary return at the end
of void functions.
Luca Barbato [Thu, 27 Jun 2013 00:20:59 +0000 (02:20 +0200)]
qdm2: use init_static_data
Luca Barbato [Thu, 27 Jun 2013 02:30:20 +0000 (04:30 +0200)]
westwood_vqa: do not free extradata on error in read_header
The extradata is already freed by avformat_open_input on
failure.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Thu, 27 Jun 2013 01:19:05 +0000 (03:19 +0200)]
vqavideo: check the version
Prevent out of buffer write.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sat, 6 Jul 2013 23:52:51 +0000 (01:52 +0200)]
cmdutils: wrap exit explicitly
Some C runtime implementations deadlock when calling threading functions
on the atexit() handler.
Use a simpler wrapper similar to av_log to call the cleanup function
before exit.
Bug-Id: 523
Martin Storsjö [Sun, 7 Jul 2013 11:59:47 +0000 (14:59 +0300)]
movenc: K&R formatting cosmetics
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 7 Jul 2013 09:56:02 +0000 (11:56 +0200)]
Makefile: Remove stray tabs
Signed-off-by: Martin Storsjö <martin@martin.st>
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: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Mon, 24 Jun 2013 23:13:58 +0000 (19:13 -0400)]
yuv4mpeg: Correctly round chroma up for odd luma sizes
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 1 Jul 2013 21:38:08 +0000 (23:38 +0200)]
rmdec: Use the AVIOContext given as parameter in rm_read_metadata()
This fixes crashes when playing back certain RealRTSP streams.
When invoked from the RTP depacketizer, the full realmedia
demuxer isn't invoked, but only certain functions from it, where
a separate AVIOContext is passed in as parameter (for the buffer
containing the data to parse). The functions called from within
those entry points should only be using that parameter, not
s->pb. In the depacketizer case, s is the RTSP context, where ->pb
is null.
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 24 Jun 2013 12:23:44 +0000 (14:23 +0200)]
avio: Handle AVERROR_EOF in the same way as the return value 0
This makes sure the ffurl_read_complete function actually
returns the number of bytes read, as the documentation of the
function says, even if the underlying protocol uses AVERROR_EOF
instead of 0.
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Mon, 24 Jun 2013 16:12:24 +0000 (18:12 +0200)]
wtv: Mark attachment with a negative stream id
A sid 0 would be mismatched to the attachment.
Prevent NULL pointer dereference.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 21 Jun 2013 12:47:01 +0000 (14:47 +0200)]
avprobe: rename the prettyprint structures
Paul B Mahol [Sat, 6 Jul 2013 16:30:11 +0000 (16:30 +0000)]
dxa: make code independent of sizeof(AVFrame)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 7 Jul 2013 16:39:07 +0000 (18:39 +0200)]
mmsh: reimplement seeking
Fixes Ticket2682
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 13:03:12 +0000 (15:03 +0200)]
avformat_find_stream_info: use fps_dts as last resort to determine duration
Fixes long delay with some hardware generated h264 in ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 10:50:41 +0000 (12:50 +0200)]
avformat/mp3dec: read TOC even if not all needed information is available
This fixes hyothetical bugs with parsing of elements after the TOC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 10:37:07 +0000 (12:37 +0200)]
avformat/mp3dec: read xing toc independant of usetoc, only skip filling index if requested
Fixes hypothetical parsing bug with -usetoc 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 09:56:02 +0000 (11:56 +0200)]
avformat/Makefile: remove stray tab
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 09:48:05 +0000 (11:48 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wtv: Mark attachment with a negative stream id
Conflicts:
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 09:35:59 +0000 (11:35 +0200)]
Merge commit '
a4baf96abd64cda68e3e4692b182bdf60745a14d'
* commit '
a4baf96abd64cda68e3e4692b182bdf60745a14d':
avprobe: rename the prettyprint structures
tools: Wording and formatting cosmetics
Conflicts:
avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 09:26:28 +0000 (11:26 +0200)]
Merge commit '
6516632967da5e6bd7d6136e8678f826669ed26e'
* commit '
6516632967da5e6bd7d6136e8678f826669ed26e':
tests: Only run noproxy test if networking is enabled
fifo: K&R formatting cosmetics
Conflicts:
libavformat/Makefile
libavutil/fifo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 08:59:19 +0000 (10:59 +0200)]
Merge commit '
4e7f0b082d8c4b360312216b9241bec65ff63b35'
* commit '
4e7f0b082d8c4b360312216b9241bec65ff63b35':
kmvc: Clip pixel position to valid range
The added clip should make no difference, there are already checks for
the index.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 08:53:20 +0000 (10:53 +0200)]
Merge commit '
8f689770548c86151071ef976cf9b6998ba21c2a'
* commit '
8f689770548c86151071ef976cf9b6998ba21c2a':
kmvc: use fixed sized arrays in the context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 00:42:40 +0000 (02:42 +0200)]
avformat/mov: Fix duration of fragmented mov
Fixes Ticket2757
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jul 2013 23:39:43 +0000 (01:39 +0200)]
dct_unquantize_h263_intra_c: fix assert condition
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jul 2013 23:29:48 +0000 (01:29 +0200)]
libavcodec/x86/mpegvideo: Move mmx functions under HAVE_MMX_INLINE
should fix ticket2755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jul 2013 23:29:18 +0000 (01:29 +0200)]
avcodec/x86/vp3dsp_init: move mmx functions under HAVE_MMX_INLINE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jul 2013 21:53:19 +0000 (23:53 +0200)]
oggparseskeleton: avoid header parsing failure
Based on description by James Almer and the xiph wiki
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jul 2013 20:05:35 +0000 (22:05 +0200)]
nutdec: use ff_find_last_ts()
Fixes finding the duration for nut files that are truncated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jul 2013 19:52:07 +0000 (21:52 +0200)]
avformat/utils: factor ff_find_last_ts() out of ff_gen_search()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 5 Jul 2013 15:42:37 +0000 (17:42 +0200)]
tools: Wording and formatting cosmetics
Diego Biurrun [Tue, 2 Jul 2013 15:16:18 +0000 (17:16 +0200)]
tests: Only run noproxy test if networking is enabled
Luca Barbato [Sat, 6 Jul 2013 10:05:27 +0000 (12:05 +0200)]
fifo: K&R formatting cosmetics
Luca Barbato [Mon, 1 Jul 2013 01:05:41 +0000 (03:05 +0200)]
kmvc: Clip pixel position to valid range
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org