OSDN Git Service
Gwenole Beauchesne [Mon, 28 Mar 2011 08:18:58 +0000 (10:18 +0200)]
Fix check for new enough CrystalHD library.
Signed-off-by: Philip Langdale <philipl@overt.org>
Michael Niedermayer [Tue, 29 Mar 2011 00:46:11 +0000 (02:46 +0200)]
Merge remote-tracking branch 'newdev/master'
* newdev/master:
ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks.
Chronomaster DFA decoder
DUPLICATE: framebuffer device demuxer
NOT MERGED: cosmetics: fix dashed line length after
070c5d0
http: header field names are case insensitive
Conflicts:
LICENSE
README
doc/indevs.texi
libavdevice/fbdev.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Mar 2011 00:13:33 +0000 (02:13 +0200)]
Add crystalhd maintainer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Mar 2011 19:57:00 +0000 (21:57 +0200)]
Revert some silly renamings that leaked in from a pull.
Stefano Sabatini [Sun, 27 Mar 2011 22:03:19 +0000 (00:03 +0200)]
mp: extend syntax, make it accept mp=filter=params
Make the mp wrapper accept the syntax mp=filter=params as alternative
to mp=filter:params. The alternative syntax is sligthly more readable
and should simplify copy&paste of MPlayer filter strings to the mp
filter.
Stefano Sabatini [Sun, 27 Mar 2011 21:02:24 +0000 (23:02 +0200)]
documentation: sort filter descriptions in filters.texi
Change position of the fade filter description, put it between
drawtext and fifo descriptions.
Stefano Sabatini [Sat, 26 Mar 2011 15:17:18 +0000 (16:17 +0100)]
documentation: extend documentation for ffmpeg -aspect option
Stefano Sabatini [Mon, 28 Mar 2011 14:07:08 +0000 (16:07 +0200)]
sndio: prefer "FFmpeg" over "Libav" in the license header
Reimar Döffinger [Sun, 27 Mar 2011 12:38:21 +0000 (14:38 +0200)]
Use consistent condition for whether to run slice-threading execute function.
Reimar Döffinger [Sat, 26 Mar 2011 12:55:30 +0000 (13:55 +0100)]
Unbreak avcodec_thread_init
avcodec_thread_init currently doesn't do anything at all with pthreads enabled.
Justin Ruggles [Mon, 28 Mar 2011 18:01:27 +0000 (14:01 -0400)]
ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using
exponent reference blocks.
Kostya Shishkov [Tue, 15 Mar 2011 08:37:48 +0000 (09:37 +0100)]
Chronomaster DFA decoder
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Mon, 7 Mar 2011 17:54:52 +0000 (18:54 +0100)]
framebuffer device demuxer
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Mon, 28 Mar 2011 14:46:45 +0000 (16:46 +0200)]
Fix compilation failure with runtime cpudetect (Ticket #22)
Janne Grunau [Mon, 28 Mar 2011 07:53:40 +0000 (09:53 +0200)]
cosmetics: fix dashed line length after
070c5d0
Tyler [Sun, 27 Mar 2011 00:59:09 +0000 (17:59 -0700)]
http: header field names are case insensitive
Amazon S3 sends header field names all lowercase.
This is actually acceptable according to the HTTP standard.
http://tools.ietf.org/html/rfc2616#section-4.2
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Sun, 27 Mar 2011 23:50:36 +0000 (01:50 +0200)]
Merge remote-tracking branch 'newdev/master'
* newdev/master:
ac3enc: Add codec-specific options for writing AC-3 metadata.
NOT MERGED: Remove arrozcru URL from documentation
sndio support for playback and record
Conflicts:
doc/faq.texi
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 27 Mar 2011 22:09:58 +0000 (00:09 +0200)]
Implement interlaced scaling.
Fixes issue2632 if interl=1 is used or the automatic interlace detection is enabled
and works. This has the advantage compared to the patch in issue2632 that it causes
no speed loss and it also works when scaling is used. The disadvantage is that
interlacing autodetection does not yet work very well it seems.
This is the same method mplayer uses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Aurelien Jacobs [Tue, 14 Sep 2010 03:55:12 +0000 (05:55 +0200)]
add SubRip encoder
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Stefano Sabatini [Sun, 27 Mar 2011 16:32:52 +0000 (18:32 +0200)]
drawtext: draw glyphs for the strftime()-expanded text
In draw_glyphs(), draw glyphs in dtext->expanded_text rather than in
dtext->text. Fix crash if a strftime() sequence is used.
Stefano Sabatini [Sun, 27 Mar 2011 16:21:54 +0000 (18:21 +0200)]
drawtext: fix minor errors and typos in the filter description
Justin Ruggles [Fri, 25 Mar 2011 21:12:26 +0000 (17:12 -0400)]
ac3enc: Add codec-specific options for writing AC-3 metadata.
Stefano Sabatini [Sat, 26 Mar 2011 14:49:07 +0000 (15:49 +0100)]
setdar: prefer "sar" over "par" in log info message
This is more consistent with the terminology adopted by the aspect
filter names.
Stefano Sabatini [Sat, 26 Mar 2011 14:26:45 +0000 (15:26 +0100)]
ffmpeg: warns the user when the selected pixel format is ignored
Ramiro Polla [Sun, 27 Mar 2011 00:22:23 +0000 (21:22 -0300)]
Remove arrozcru URL from documentation
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Brad [Sat, 26 Mar 2011 23:03:41 +0000 (19:03 -0400)]
sndio support for playback and record
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Sun, 27 Mar 2011 00:40:18 +0000 (01:40 +0100)]
Merge remote-tracking branch 'newdev/master'
* newdev/master:
dsputil: allow to skip drawing of top/bottom edges.
Split fate-psx-str-v3 into a video-only and audio-only test.
Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo.c
libavcodec/snow.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Mar 2011 18:29:37 +0000 (19:29 +0100)]
make xvid less picky about unkown aspect
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Philip Langdale [Sat, 26 Mar 2011 06:06:28 +0000 (23:06 -0700)]
CrystalHD: Remove redundant interlaced check.
Signed-off-by: Philip Langdale <philipl@overt.org>
Philip Langdale [Sat, 26 Mar 2011 05:50:08 +0000 (22:50 -0700)]
CrystalHD: Add 2011 to Copyright
Signed-off-by: Philip Langdale <philipl@overt.org>
Philip Langdale [Sat, 26 Mar 2011 23:04:48 +0000 (16:04 -0700)]
Revert "CrystalHD: Improve interlaced h.264 support."
This reverts commit
e44073ca5e7143934ffa79d317dc65150db1637c.
Philip Langdale [Sat, 26 Mar 2011 23:04:43 +0000 (16:04 -0700)]
Revert "CrystalHD: Add heuristics to try and distinguish h.264 PAFF variants."
This reverts commit
4ab57cffba1d151898837a9a07a6a72f78716702.
Philip Langdale [Sat, 26 Mar 2011 23:04:36 +0000 (16:04 -0700)]
Revert "CrystalHD: Refine heuristic logic."
This reverts commit
f968ef922d5b1e1ba29145bceaa0278ece4f88e0.
Philip Langdale [Sun, 20 Mar 2011 23:29:04 +0000 (16:29 -0700)]
CrystalHD: Refine heuristic logic.
Philip Langdale [Thu, 17 Mar 2011 05:27:51 +0000 (22:27 -0700)]
CrystalHD: Add heuristics to try and distinguish h.264 PAFF variants.
As previously discussed, the CrystalHD hardware treats some PAFF
clips different from others; even when input fields are always in
separate packets, the hardware might return a single fieldpair for
one clip and individual fields for another.
Given the bogus flags set by the hardware, it is impossible to
distinguish these two cases without knowing about the current
picture and the next one. The hardware can usually provide the
picture number of the next picture and when that is available,
we can detect the two cases.
When it is not available, we have to guess - and find out later
if we were right or wrong.
With this change, clips will play correctly unless they are PAFF
where individual fields are returned *and* no next picture number
is available. Generally speaking, the incorrect cases arise in
the first couple of seconds of a clip as the delay calibration takes
place. Once that's set, things work fine.
Philip Langdale [Tue, 15 Mar 2011 04:47:35 +0000 (21:47 -0700)]
CrystalHD: Improve interlaced h.264 support.
As previously discussed, the CrystalHD hardware returns exceptionally
useless information about interlaced h.264 content - to the extent
that it's not possible to distinguish MBAFF and PAFF content until
it's too late.
This change introduces use of the h264_parser to help bridge the
gap; it can indicate if the input data is PAFF fields or not.
With this clarity, some of heuristics can be removed from the code,
making this less convoluted.
Finally, I found an MBAFF clip that acts like non h.264 content so
I had to make allowances for that.
Note that I still cannot distinguish between two forms of PAFF,
where the hardware either returns individual fields or a field-pair.
It's not clear that there's even a spec relevant difference between
the two forms, as opposed to hardware ideosyncracies.
Alexander Strange [Sat, 26 Mar 2011 21:31:13 +0000 (17:31 -0400)]
dsputil: allow to skip drawing of top/bottom edges.
Ronald S. Bultje [Sat, 26 Mar 2011 20:28:16 +0000 (16:28 -0400)]
Split fate-psx-str-v3 into a video-only and audio-only test.
Ilya [Sat, 26 Mar 2011 16:13:36 +0000 (17:13 +0100)]
Use strtoul to parse rtptime and seq values.
strtol could return negative values, leading to various error messages,
mainly "non-monotonically increasing dts".
Nicolas George [Thu, 10 Mar 2011 11:10:34 +0000 (12:10 +0100)]
ALSA: implement channel layout for playback.
Currently, only S16 quad, 5.1 and 7.1 are implemented.
Implementing support for other formats/layouts and capture should be
straightforward.
7.1 support by Carl Eugen Hoyos.
Stefano Sabatini [Thu, 24 Mar 2011 13:39:23 +0000 (14:39 +0100)]
ffprobe: provide format parameters to av_open_input_file()
Provide a non-NULL AVFormatParameters structure to
av_open_input_file() in open_input_file().
This is required because otherwise av_open_input_file() will allocate
and use a new format context, discarding the options set in the
provided format context.
Stefano Sabatini [Tue, 15 Mar 2011 11:34:55 +0000 (12:34 +0100)]
lavf: make compute_pkt_fields2() return meaningful error values
Stefano Sabatini [Sat, 12 Mar 2011 11:44:22 +0000 (12:44 +0100)]
cmdutils: remove list_fmts(), simplify
The function was only used in opt_sample_fmt() for listing the sample
formats. Move list_fmts() functionality directly into
opt_sample_fmt().
Als fix the warning:
ffmpeg.c: In function ‘opt_audio_sample_fmt’:
ffmpeg.c:2877: warning: passing argument 1 of ‘list_fmts’ from incompatible pointer type
cmdutils.h:163: note: expected ‘void (*)(char *, int, int)’ but argument is of type ‘char * (*)(char *, int, enum AVSampleFormat)’
Reimar Döffinger [Fri, 25 Mar 2011 17:58:07 +0000 (18:58 +0100)]
DPX decode: add buffer size checks.
Peter Ross [Sat, 19 Mar 2011 13:25:18 +0000 (00:25 +1100)]
nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
Peter Ross [Sat, 19 Mar 2011 13:24:24 +0000 (00:24 +1100)]
rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
Peter Ross [Sat, 19 Mar 2011 11:11:03 +0000 (22:11 +1100)]
Make the hflip filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
Peter Ross [Sat, 19 Mar 2011 11:05:53 +0000 (22:05 +1100)]
Make the crop filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
Peter Ross [Thu, 17 Mar 2011 10:07:18 +0000 (21:07 +1100)]
libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation
Michael Niedermayer [Sat, 26 Mar 2011 01:42:40 +0000 (02:42 +0100)]
Merge remote-tracking branch 'newdev/master'
* newdev/master:
mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
Use audio_service_type to set stream disposition.
Add APIchanges entry for audio_service_type.
Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
configure: in check_ld, place new -l flags before existing ones
support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
doc: update build system documentation
aacenc: indentation
aacenc: fix the side calculation in search_for_ms
vp8.c: rename EDGE_* to VP8_EDGE_*.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/vp8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Thu, 24 Mar 2011 16:42:05 +0000 (12:42 -0400)]
mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
Justin Ruggles [Thu, 24 Mar 2011 16:10:38 +0000 (12:10 -0400)]
Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser
and decoder, and vice-versa for the AC-3 encoder.
Justin Ruggles [Thu, 24 Mar 2011 16:09:02 +0000 (12:09 -0400)]
Use audio_service_type to set stream disposition.
Justin Ruggles [Thu, 24 Mar 2011 16:08:13 +0000 (12:08 -0400)]
Add APIchanges entry for audio_service_type.
Justin Ruggles [Thu, 24 Mar 2011 16:00:21 +0000 (12:00 -0400)]
Add audio_service_type field to AVCodecContext for encoding and reporting
of the service type in the audio bitstream.
Mans Rullgard [Fri, 25 Mar 2011 19:26:10 +0000 (19:26 +0000)]
configure: in check_ld, place new -l flags before existing ones
This fixes some library tests when --as-needed is in effect.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Reimar Döffinger [Thu, 24 Mar 2011 20:23:15 +0000 (21:23 +0100)]
Update to latest MPlayer version.
Avoids warnings due to pointlessly casting away const.
Michael Niedermayer [Fri, 25 Mar 2011 17:41:39 +0000 (18:41 +0100)]
lavc: Bump micro for dvd subtitle cb/cr fix Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexandre Colucci [Fri, 25 Mar 2011 16:31:28 +0000 (17:31 +0100)]
Fix incorrect colors when decoding Blu-ray subtitles
On Blu-ray colors are stored in the order YCrCb (and not YCbCr) as mentioned in the specifications:
see System Description Blu-ray Disc Read-Only Format, 9.14.4.2.2.1 Palette Definition Segment
When decoding a Blu-ray subtitle, the colors were incorrectly set.
Alexandre Colucci [Fri, 25 Mar 2011 10:25:02 +0000 (11:25 +0100)]
Fix incorrect colors when decoding DVD subtitles
On DVD and HD-DVD colors are stored in the order YCrCb (and not YCbCr) as mentioned in the specifications:
see DVD Specifications for Read-Only Disc / Part 3, 4.3 Program Chain Information (7) PGC_SP_PLT
see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (11) PGC_SDSP_PLT
see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (12) PGC_HDSP_PLT
see DVD Specifications for High Definition Disc, 5.5 Presentation Data (4) SET_COLOR2
When decoding a DVD or HD-DVD subtitle, the colors were incorrectly set.
Stefano Sabatini [Fri, 25 Mar 2011 17:49:24 +0000 (18:49 +0100)]
configure: sort filter deps entries
Stefano Sabatini [Fri, 25 Mar 2011 17:47:22 +0000 (18:47 +0100)]
configure: update ffmpeg-user mailing-list address
The address recently changed from ffmpeg-user@mplayerhq.hu to
ffmpeg-user@ffmpeg.org.
Stefano Sabatini [Fri, 25 Mar 2011 17:42:51 +0000 (18:42 +0100)]
ffmpeg: include conditionally the sws_flags variable
The variable is not used when libavfilter is enabled.
Fix the warning:
ffmpeg.c: At top level:
ffmpeg.c:242: warning: ‘sws_flags’ defined but not used
Justin Ruggles [Thu, 24 Mar 2011 22:39:19 +0000 (18:39 -0400)]
support @heading, @subheading, @subsubheading, and @subsubsection in
texi2pod.pl
Michael Niedermayer [Fri, 25 Mar 2011 11:00:17 +0000 (12:00 +0100)]
Revert "matroskadec: set default duration for simple block"
This reverts commit
98a7d560b4f835ba5b99b9974ee1a2c096198bea.
This has been implemented differently by aurel already
Luca Barbato [Mon, 21 Mar 2011 23:20:56 +0000 (00:20 +0100)]
doc: update build system documentation
Split normal build system documentation and the fate one.
Document THREADS make variable and provide an introduction to fate.
Document DESTDIR make variable and add some generic targets.
Young Han Lee [Fri, 25 Mar 2011 03:17:48 +0000 (12:17 +0900)]
aacenc: indentation
Young Han Lee [Thu, 24 Mar 2011 01:49:36 +0000 (10:49 +0900)]
aacenc: fix the side calculation in search_for_ms
Michael Niedermayer [Fri, 25 Mar 2011 01:57:24 +0000 (02:57 +0100)]
Merge remote-tracking branch 'newdev/master'
* newdev/master:
matroskadec: set default duration for simple block
When building for MinGW32 disable strict ANSI compliancy.
ARM: fix ff_apply_window_int16_neon() prototype
configure: check for --as-needed support early
ARM: NEON optimised apply_window_int16()
ac3enc: NEON optimised shift functions
ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min
mpeg12.c: fix slice threading for mpeg2 field picture mode.
ffmetadec.c: fix compiler warnings.
configure: Don't explicitly disable ffplay or in/outdevices on dos
configure: Remove the explicit disabling of ffserver
configure: Add fork as a dependency to ffserver
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 Mar 2011 01:37:37 +0000 (02:37 +0100)]
Merge remote-tracking branch 'ffmpeg-mt/master'
* ffmpeg-mt/master:
Update todo.
Draw edges in MPV_frame_end when encoding
Conflicts:
libavcodec/mpegvideo.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 Mar 2011 01:50:09 +0000 (02:50 +0100)]
Remove a tab, somehow it sneaked past the hooks in the merge war.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexander Strange [Fri, 25 Mar 2011 01:20:13 +0000 (21:20 -0400)]
vp8.c: rename EDGE_* to VP8_EDGE_*.
Michael Niedermayer [Fri, 25 Mar 2011 01:26:49 +0000 (02:26 +0100)]
Make multiple Ctrl-C capable to kill stuck protocols.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 Mar 2011 01:24:32 +0000 (02:24 +0100)]
Fix apparently exploitable race condition.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 Mar 2011 00:13:08 +0000 (01:13 +0100)]
More advanced ffmpeg mpeg2 aspect guessing code.
Fixes issue1613, 621, 562 simultaneously
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 24 Mar 2011 23:20:07 +0000 (00:20 +0100)]
log:Sanitize string of most control chars before printing.
This may be security relevant depending upon the used terminal.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
XV [Thu, 24 Mar 2011 21:32:21 +0000 (22:32 +0100)]
Intel H.263 aspect ratio processing fix.
XV [Thu, 24 Mar 2011 21:29:31 +0000 (22:29 +0100)]
Fix Intel I.263 "Strict H.263 compliance" file playback / issue2449
Aurelien Jacobs [Fri, 25 Mar 2011 00:02:53 +0000 (01:02 +0100)]
srtdec: make sure we don't write past the end of buffer
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
John Stebbins [Thu, 24 Mar 2011 23:34:18 +0000 (00:34 +0100)]
matroskadec: set default duration for simple block
When a normal Block is parsed, duration is initialized to
AV_NOPTS_VALUE. If it is not changed, then the track's default
duration is used. But for SimpleBlock, duration is initialized to
0 instead of AV_NOPTS_VALUE. This is due to the difference in how
EBML_NEST vs EBML_PASS are processed. Setting duration to 0 leads
eventually to wrongly estimate the frame duration in util.c
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diego Elio Pettenò [Thu, 24 Mar 2011 11:18:35 +0000 (12:18 +0100)]
When building for MinGW32 disable strict ANSI compliancy.
When -std=c99 is used, GCC defines __STRICT_ANSI__ to hide non-ANSI
interfaces; on MinGW32, when this macro is defined, some functions that are
part of POSIX but not of Windows APIs are disabled, including strcasecmp().
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Mans Rullgard [Thu, 24 Mar 2011 20:22:34 +0000 (20:22 +0000)]
ARM: fix ff_apply_window_int16_neon() prototype
The length argument should be unsigned. No change in code.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 6 Mar 2011 13:57:34 +0000 (13:57 +0000)]
configure: check for --as-needed support early
This moves the check for --as-needed linker support before all
library tests, ensuring consistent behaviour between the checks
and the actual link step.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 23 Mar 2011 01:45:43 +0000 (01:45 +0000)]
ARM: NEON optimised apply_window_int16()
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 12 Mar 2011 23:16:06 +0000 (23:16 +0000)]
ac3enc: NEON optimised shift functions
Mans Rullgard [Wed, 9 Mar 2011 19:51:50 +0000 (19:51 +0000)]
ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min
Ronald S. Bultje [Thu, 24 Mar 2011 16:16:22 +0000 (12:16 -0400)]
mpeg12.c: fix slice threading for mpeg2 field picture mode.
Fixes "make THREADS=2 fate-mpeg2-field-enc".
Tomas Härdin [Mon, 21 Mar 2011 09:52:36 +0000 (10:52 +0100)]
Improve channel count and bitrate error handling in wmav* encode_init()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Thu, 24 Mar 2011 11:41:03 +0000 (07:41 -0400)]
ffmetadec.c: fix compiler warnings.
Martin Storsjö [Wed, 23 Mar 2011 12:49:37 +0000 (12:49 +0000)]
configure: Don't explicitly disable ffplay or in/outdevices on dos
The normal dependency tracking system disables them just fine.
Martin Storsjö [Wed, 23 Mar 2011 11:13:31 +0000 (13:13 +0200)]
configure: Remove the explicit disabling of ffserver
It is automatically disabled on both mingw and dos due to
the lack of fork.
Martin Storsjö [Wed, 23 Mar 2011 10:26:58 +0000 (12:26 +0200)]
configure: Add fork as a dependency to ffserver
Michael Niedermayer [Thu, 24 Mar 2011 01:12:17 +0000 (02:12 +0100)]
Merge remote-tracking branch 'newdev/master'
* newdev/master:
avio: make udp_set_remote_url/get_local_port internal.
asfdec: also subtract preroll when reading simple index object
matroskaenc: remove a variable that's unused after
bc17bd9.
avio: cosmetics - nicer vertical alignment.
Remove unnecessary icc version checks
Disable 'attribute "foo" ignored' warnings from icc
rtsp: Don't use a locale dependent format string
Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
configure: get libavcodec version from new version.h header
lavc: move the version macros to a new installed header.
matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
Do not use format string "%0.3f" for RTSP Range field.
Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder.
Document usage of import libraries created by dlltool
configure: Set the correct lib target for arm/wince dlltool
fate: simplify regression-funcs.sh
fate: add support for multithread testing
Conflicts:
libavformat/rtspdec.c
libavutil/attributes.h
libavutil/internal.h
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Aurelien Jacobs [Thu, 24 Mar 2011 00:56:26 +0000 (01:56 +0100)]
matroskaenc: make sure we don't produce invalid file with no codec ID
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Aurelien Jacobs [Thu, 24 Mar 2011 00:54:15 +0000 (01:54 +0100)]
matroskaenc: add missing new line in av_log() call
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Aurelien Jacobs [Wed, 23 Mar 2011 23:28:19 +0000 (00:28 +0100)]
matroskadec: check that pointers were initialized before accessing them
fix ticket #14
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Compn [Wed, 23 Mar 2011 17:53:24 +0000 (13:53 -0400)]
fix typo
Anton Khirnov [Tue, 8 Mar 2011 09:35:52 +0000 (10:35 +0100)]
avio: make udp_set_remote_url/get_local_port internal.
Vladimir Pantelic [Thu, 17 Mar 2011 21:34:52 +0000 (22:34 +0100)]
asfdec: also subtract preroll when reading simple index object
This was missed when ASF was changed to return timestamps
without preroll.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Anton Khirnov [Wed, 23 Mar 2011 10:09:34 +0000 (11:09 +0100)]
matroskaenc: remove a variable that's unused after
bc17bd9.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>