OSDN Git Service
Michael Niedermayer [Mon, 11 Nov 2013 21:29:45 +0000 (22:29 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
libzvbi-teletextdec: propagate errors generated in page handler
libzvbi-teletextdec: dont ignore memory allocation error silently
libzvbi-teletextdec: output ass subtitles instead of plain text
ass: move text_event_to_ass from textdec.c to ass.c and export it
ass: fix error handling in ff_ass_add_subrect
ass: factor out ff_ass_bprint_dialog
libzvbi-teletextdec: use AVBPrint for whitespace cleanup
libzvbi-teletextdec: use option constants instead of strings
libzvbi-teletextdec: fix indentation after last commit
libzvbi-teletextdec: support multiple teletext pages in a single packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Nov 2013 21:21:38 +0000 (22:21 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegaudioenc: Move some static tables to MpegAudioContext
Conflicts:
libavcodec/mpegaudioenc.c
libavcodec/mpegaudiotab.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Nov 2013 20:46:35 +0000 (21:46 +0100)]
Merge commit '
5d6a990c115850326711c2f5be4d9fd33f399616'
* commit '
5d6a990c115850326711c2f5be4d9fd33f399616':
mpegaudioenc: Remove broken integer-only quantization code path
Conflicts:
libavcodec/mpegaudioenc.c
Mostly not merged, the integer code works fine.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Nov 2013 18:53:22 +0000 (19:53 +0100)]
avformat/electronicarts: check chunksize more completely in probe()
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Nov 2013 18:51:12 +0000 (19:51 +0100)]
avformat/electronicarts: check chunk size.
Fix infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Nov 2013 17:11:43 +0000 (18:11 +0100)]
avformat/dfa: check first frame offset in probe
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Nov 2013 16:26:03 +0000 (17:26 +0100)]
avformat/bethsoftvid: check 4th header byte in probe
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Nov 2013 13:51:43 +0000 (14:51 +0100)]
avformat/avr: check channels and bps in probe
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Nov 2013 15:59:10 +0000 (16:59 +0100)]
avformat/utils: disabled debug code to collect format probing statistics
This allows collecting statistics on probing scores and the amount of data
probing needed for various files and formats.
For example it can be used to find out which formats tend to need more
data for probing or which files are probed with less certain/lower scores
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 9 Nov 2013 23:36:37 +0000 (15:36 -0800)]
doc: delete viterbi.txt
The description has been moved to the FFmpeg wiki:
https://trac.ffmpeg.org/wiki/ViterbiAlgorithm
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Michael Niedermayer [Sun, 10 Nov 2013 20:42:40 +0000 (21:42 +0100)]
ffmpeg: remove unneeded include "libswscale/swscale.h"
Found-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Fri, 25 Oct 2013 19:12:23 +0000 (21:12 +0200)]
libzvbi-teletextdec: propagate errors generated in page handler
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Fri, 25 Oct 2013 19:02:00 +0000 (21:02 +0200)]
libzvbi-teletextdec: dont ignore memory allocation error silently
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Wed, 23 Oct 2013 22:04:05 +0000 (00:04 +0200)]
libzvbi-teletextdec: output ass subtitles instead of plain text
Signed-off-by: Marton Balint <cus@passwd.hu>
Clément Bœsch [Sun, 10 Nov 2013 18:16:45 +0000 (19:16 +0100)]
avfilter/fade: use FADE_OUT macro.
Clément Bœsch [Sun, 10 Nov 2013 18:15:19 +0000 (19:15 +0100)]
avfilter/fade: remove a bunch of useless parenthesis.
Clément Bœsch [Sun, 10 Nov 2013 18:12:36 +0000 (19:12 +0100)]
avfilter/fade: use inlink->frame_count.
Clément Bœsch [Fri, 8 Nov 2013 22:59:40 +0000 (23:59 +0100)]
avfilter/fade: add color option.
Fixes Ticket #1822.
Marton Balint [Wed, 23 Oct 2013 18:03:17 +0000 (20:03 +0200)]
ass: move text_event_to_ass from textdec.c to ass.c and export it
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Wed, 23 Oct 2013 09:27:25 +0000 (11:27 +0200)]
ass: fix error handling in ff_ass_add_subrect
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Wed, 23 Oct 2013 09:20:04 +0000 (11:20 +0200)]
ass: factor out ff_ass_bprint_dialog
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Wed, 23 Oct 2013 21:15:54 +0000 (23:15 +0200)]
libzvbi-teletextdec: use AVBPrint for whitespace cleanup
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 20 Oct 2013 18:50:54 +0000 (20:50 +0200)]
libzvbi-teletextdec: use option constants instead of strings
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 29 Sep 2013 13:23:37 +0000 (15:23 +0200)]
libzvbi-teletextdec: fix indentation after last commit
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 28 Jul 2013 20:07:01 +0000 (22:07 +0200)]
libzvbi-teletextdec: support multiple teletext pages in a single packet
After this patch, if a packet contains multiple teletext pages, the teletext
decoder can return the fist page and store the remaining pages in memory, and
return them to the user on the next calls to avcodec_decode_subtitle2.
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Sun, 10 Nov 2013 16:37:51 +0000 (17:37 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hwaccel: Simplify ff_find_hwaccel
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 4 Nov 2013 20:14:03 +0000 (21:14 +0100)]
mpegaudioenc: Move some static tables to MpegAudioContext
This reduces global state and the amount of globally visible tables.
Diego Biurrun [Sat, 9 Nov 2013 13:17:16 +0000 (14:17 +0100)]
mpegaudioenc: Remove broken integer-only quantization code path
Michael Niedermayer [Sun, 10 Nov 2013 15:04:33 +0000 (16:04 +0100)]
avformat/diracdec: check 2 chunks in probe
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 9 Nov 2013 16:07:34 +0000 (17:07 +0100)]
hwaccel: Simplify ff_find_hwaccel
It is always called by passing fields from an AVCodecContext.
Michael Niedermayer [Sun, 10 Nov 2013 12:10:23 +0000 (13:10 +0100)]
avformat/astdec: increase the score for odd samplerate/channels to max/8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Nov 2013 12:10:23 +0000 (13:10 +0100)]
avformat/rsd: increase the score for odd samplerate/channels to max/8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Nov 2013 12:10:23 +0000 (13:10 +0100)]
avformat/lvfdec: increase the score for odd channels to max/8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Nov 2013 11:53:38 +0000 (12:53 +0100)]
avformat/swfdec: return AVPROBE_SCORE_MAX / 4 for unexpected versions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Nov 2013 11:48:33 +0000 (12:48 +0100)]
avformat/ape: check version in probe
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 9 Nov 2013 23:04:36 +0000 (15:04 -0800)]
doc/encoders: fix libfdk-aac "Examples" subsection
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Michael Niedermayer [Sun, 10 Nov 2013 11:21:54 +0000 (12:21 +0100)]
avcodec/vp8: remove unused webp_decode_frame()
See: libavcodec/webp.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Nov 2013 11:20:40 +0000 (12:20 +0100)]
avformat/dv: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 9 Nov 2013 23:20:15 +0000 (15:20 -0800)]
doc/doxy-wrapper: disable inserting headers and footers
The headers and footers are used to integrate Doxygen into Libav's website.
Fixes the Libav-ish look when doing `make apidoc`.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Nov 2013 00:42:22 +0000 (01:42 +0100)]
avformat/thp: check fps value during probing
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Nov 2013 00:28:32 +0000 (01:28 +0100)]
avformat/thp: do not set sample_rate for a video codec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 9 Nov 2013 15:52:49 +0000 (10:52 -0500)]
vp9: fix mvref finding to adhere to bug in libvpx.
Fixes a particular youtube video that I unfortunately can't share.
Erik Olofsson [Sat, 9 Nov 2013 19:26:00 +0000 (20:26 +0100)]
libavf/avienc: store language metadata for XSUB streams
Formatted in such a way that DivX certified players can decode it.
Verified on Sony Playstation 3 and Philips DVP3380.
Fixes ticket 2385
Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 4 Nov 2013 09:05:24 +0000 (10:05 +0100)]
ffmpeg: generate more specific error message in case of inconsistent filtering options
In particular, distinguish if the option was -filter or -filter_script.
Suggested-by: Nicolas George
Stefano Sabatini [Mon, 4 Nov 2013 09:02:27 +0000 (10:02 +0100)]
ffmpeg: store value of -filter and -filter_script per-stream option in OutputStream struct
Avoid the need for multiple potentially inconsistent access operations,
slightly factorize code.
Michael Niedermayer [Sat, 9 Nov 2013 16:31:35 +0000 (17:31 +0100)]
avformat/dv: consider a header match at byte 0 to count as detection of dv in probe
This reduces the amount of data needed to identify dv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Nov 2013 15:09:26 +0000 (16:09 +0100)]
mpegts: only calculate stat index when its needed during probe
40% faster probe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Nov 2013 15:03:41 +0000 (16:03 +0100)]
avformat/mpegts: do not hardcode type used in memset()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Nov 2013 13:43:51 +0000 (14:43 +0100)]
avformat/dv: about 3 times faster probe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 8 Nov 2013 22:55:06 +0000 (23:55 +0100)]
build: avoid stdin stall with GNU AS probing.
a758c5e added probing for various tools, such as AS. Unfortunately, GNU
AS is reading stdin with -v, and thus configure is stalled with
configure arguments such as --as=as.
Fixes Ticket #1898.
James Zern [Sat, 9 Nov 2013 04:16:17 +0000 (20:16 -0800)]
riff: add VP9 fourcc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Nov 2013 00:45:24 +0000 (01:45 +0100)]
avformat/mp3dec: 4x faster probing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Nov 2013 00:12:10 +0000 (01:12 +0100)]
avformat/h261dec: dont accept invalid gobs in probe as valid
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Nov 2013 23:30:27 +0000 (00:30 +0100)]
avformat/h261dec: optimize probe
about 3 times faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Nov 2013 23:10:04 +0000 (00:10 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avienc: drop the vfr flag.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Nov 2013 23:03:27 +0000 (00:03 +0100)]
ffmpeg: treat avi as VFR in framerate conversion code
It can be debated if avi is vfr or cfr, it can be either depending
on the definition of vfr and cfr.
This commit ensures that avi is treated correctly independent of
the AVFMT_VARIABLE_FPS value.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Nov 2013 22:36:59 +0000 (23:36 +0100)]
Merge commit '
5462dde1947e0ecfcb2db99ae29ce9dee8933b45'
* commit '
5462dde1947e0ecfcb2db99ae29ce9dee8933b45':
metasound: Fix error message argument
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Nov 2013 20:43:27 +0000 (21:43 +0100)]
avformat/mxfdec: optimize probing
about 71 times faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Nov 2013 20:15:24 +0000 (21:15 +0100)]
tools/probetest: also print the time the probe functions needed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Nov 2013 19:42:13 +0000 (20:42 +0100)]
tools/probetest: use named constant for the maximum number of formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 7 Nov 2013 21:02:00 +0000 (22:02 +0100)]
avienc: drop the vfr flag.
AVI does not really support vfr properly, only by padding with null
packets.
Paul B Mahol [Fri, 8 Nov 2013 14:23:45 +0000 (14:23 +0000)]
avcodec/mimic: use av_freep() and reset swap_buf_size
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 8 Nov 2013 14:15:31 +0000 (14:15 +0000)]
avcodec/vmdav: use av_freep() and reset unpack_buffer_size
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 8 Nov 2013 19:10:33 +0000 (20:10 +0100)]
avformat/icodec: reduce score returned on probing
The ico probe function is pretty weak just checking a few bytes for being 0, 1 or not 0
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Nov 2013 17:00:56 +0000 (18:00 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h263dsp: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Nov 2013 16:25:13 +0000 (17:25 +0100)]
Merge commit '
0338c396987c82b41d322630ea9712fe5f9561d6'
* commit '
0338c396987c82b41d322630ea9712fe5f9561d6':
dsputil: Split off H.263 bits into their own H263DSPContext
Conflicts:
configure
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Nov 2013 16:03:42 +0000 (17:03 +0100)]
avformat/lvfdec: check stream count during probing
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Fri, 8 Nov 2013 09:21:07 +0000 (10:21 +0100)]
metasound: Fix error message argument
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Fri, 8 Nov 2013 14:03:21 +0000 (15:03 +0100)]
avformat/idcin: check the decompressed frame size during probing
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 8 Nov 2013 02:06:09 +0000 (03:06 +0100)]
h263dsp: K&R formatting cosmetics
Also remove array element numbering comments.
Diego Biurrun [Tue, 5 Nov 2013 07:11:47 +0000 (08:11 +0100)]
dsputil: Split off H.263 bits into their own H263DSPContext
Hendrik Leppkes [Mon, 4 Nov 2013 15:22:27 +0000 (16:22 +0100)]
avformat/mov: only force parsing for video tracks if stss is empty
Fixes playback of some AAC streams, which are otherwise mangled by the
parser, and stss is typically only valid for video anyway.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Nov 2013 23:31:24 +0000 (00:31 +0100)]
libavcodec/dvdsubdec: remove exit() call in debug code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Nov 2013 22:39:23 +0000 (23:39 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Remove #undefs for formerly forbidden system functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Nov 2013 22:38:44 +0000 (23:38 +0100)]
avfilter/graphparser: zero filter_ctx in case of deallocation in create_filter()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Nov 2013 22:05:26 +0000 (23:05 +0100)]
Merge commit '
cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'
* commit '
cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
avfilter/graphparser: Directly free filter memory if initialization fails
Conflicts:
libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lenny Wang [Thu, 7 Nov 2013 21:15:49 +0000 (15:15 -0600)]
avfilter/unsharp: added optimized opencl kernels
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dave Yeo [Thu, 7 Nov 2013 19:10:20 +0000 (11:10 -0800)]
Fix compilation with os2threads
Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Nov 2013 17:39:23 +0000 (18:39 +0100)]
avformat/mpegvideodec: check seq headers more completely during probing
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 7 Nov 2013 19:28:44 +0000 (20:28 +0100)]
avformat/img2enc: simplify split planes extension selection.
Clément Bœsch [Sat, 19 Oct 2013 18:39:30 +0000 (20:39 +0200)]
doc/muxers: document animated GIF muxer.
Clément Bœsch [Sat, 19 Oct 2013 18:24:58 +0000 (20:24 +0200)]
avformat/gif: fix final_delay unit in documentation.
Clément Bœsch [Thu, 7 Nov 2013 19:22:25 +0000 (20:22 +0100)]
avformat/img2enc: reindent after previous commit.
Clément Bœsch [Sat, 19 Oct 2013 17:39:28 +0000 (19:39 +0200)]
avformat/image2: allow muxing gif files.
Fixes Ticket #2936.
Paul B Mahol [Thu, 7 Nov 2013 17:45:47 +0000 (17:45 +0000)]
avfilter/af_aecho: free input frame after it is being used
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 7 Nov 2013 14:55:35 +0000 (14:55 +0000)]
avcodec/libfdk-aacdec: remove redundant log messages
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 7 Nov 2013 14:04:21 +0000 (14:04 +0000)]
avcodec/hnm4video: remove redundant log message
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 6 Nov 2013 12:12:59 +0000 (13:12 +0100)]
avformat/astdec: sanity check channels & sample rate
Fixes probetest failure
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
kowalsky [Wed, 6 Nov 2013 20:01:57 +0000 (21:01 +0100)]
avformat/hls: fixed bug where custom http headers weren't kept for hls streams
See: https://trac.ffmpeg.org/ticket/3024
Diego Biurrun [Wed, 6 Nov 2013 20:07:35 +0000 (21:07 +0100)]
Remove #undefs for formerly forbidden system functions
The macros forbidding the system functions no longer exist, obviating
the need for the #undefs.
Michael Niedermayer [Wed, 6 Nov 2013 21:59:16 +0000 (22:59 +0100)]
avfilter/af_aresample: Calculate output buffer size more precisely.
Fixes accumulation of data in case of significant silence injections
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 6 Nov 2013 21:06:15 +0000 (22:06 +0100)]
avfilter/graphparser: Directly free filter memory if initialization fails
Michael Niedermayer [Wed, 6 Nov 2013 11:56:42 +0000 (12:56 +0100)]
avformat/segafilm: check 2nd tag
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Nov 2013 11:44:02 +0000 (12:44 +0100)]
avformat/swfdec: check version and size during probing
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Nov 2013 10:51:16 +0000 (11:51 +0100)]
avformat/rsd: increase probe score, as misdetections are fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Nov 2013 10:48:49 +0000 (11:48 +0100)]
avformat/rsd: Check channels and sample_rate fields
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Nov 2013 10:33:12 +0000 (11:33 +0100)]
avformat/libgme: decrease score by 1, fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Nov 2013 09:58:58 +0000 (10:58 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: add smarter method for determining video picture duration
ffplay: add frame duration estimated from frame rate to VideoPicture
ffplay: avoid code duplication in AVFILTER enabled and disabled case
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Nov 2013 10:49:09 +0000 (11:49 +0100)]
avutil/common: error out with clear message if __STDC_CONSTANT_MACROS is not defined with c++
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Nov 2013 20:58:26 +0000 (21:58 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Move -Wno-maybe-uninitialized check into gcc section
Merged-by: Michael Niedermayer <michaelni@gmx.at>
OSDN Git Service
