OSDN Git Service
Stefano Sabatini [Thu, 28 Nov 2013 20:06:08 +0000 (21:06 +0100)]
doc/ffserver: extend documentation for various file-related options
Stefano Sabatini [Thu, 28 Nov 2013 21:47:39 +0000 (22:47 +0100)]
ffserver: deprecate inconsistent parsing behavior of Truncate option
Also make it accept the more consistent behavior (boolean option set to
true when specified).
Stefano Sabatini [Thu, 28 Nov 2013 21:47:18 +0000 (22:47 +0100)]
ffserver: extend feedback in http_start_receive_data()
Michael Niedermayer [Fri, 29 Nov 2013 03:56:37 +0000 (04:56 +0100)]
avcodec/dcadec: set AV_CLASS_CATEGORY
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 29 Nov 2013 03:56:18 +0000 (04:56 +0100)]
avcodec/dcadec: AVClass is const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 29 Nov 2013 03:39:52 +0000 (04:39 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dcadec: add disable_xch private option.
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 29 Nov 2013 03:21:10 +0000 (04:21 +0100)]
Merge commit '
220494ad0b2e9e980ef703b46b69308236f29be5'
* commit '
220494ad0b2e9e980ef703b46b69308236f29be5':
dcadec: treat all 2-channel modes as Stereo in dca_downmix.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 29 Nov 2013 03:00:59 +0000 (04:00 +0100)]
Merge commit '
aaa44d0299338e3bc90128816c21dbfab06cdb48'
* commit '
aaa44d0299338e3bc90128816c21dbfab06cdb48':
dca: support mixing LFE in dca_downmix.
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 29 Nov 2013 02:48:11 +0000 (03:48 +0100)]
Merge commit '
149438cfe5d233c46bb18341b7c574fe643dd5f2'
* commit '
149438cfe5d233c46bb18341b7c574fe643dd5f2':
dca: improve default stereo downmix coefficients.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 29 Nov 2013 02:42:03 +0000 (03:42 +0100)]
avcodec/dcadec: print more details about errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 29 Nov 2013 00:53:58 +0000 (01:53 +0100)]
Merge commit '
44b17d794aa508ae21f438ae80bfe8aaf4b426e1'
* commit '
44b17d794aa508ae21f438ae80bfe8aaf4b426e1':
dca: extract core substream's embedded downmix coeffcient codes, if present.
Conflicts:
libavcodec/dcadata.h
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 29 Nov 2013 00:12:02 +0000 (01:12 +0100)]
Merge commit '
27245b4e1bbb7a863341db321b5bdc5792e427d9'
* commit '
27245b4e1bbb7a863341db321b5bdc5792e427d9':
dca: remove embedded downmix coefficient extraction.
Conflicts:
libavcodec/dcadata.h
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Nov 2013 23:32:14 +0000 (00:32 +0100)]
Merge commit '
b6d5e6aa10a2f09351f287e876f7ed4504e1f75d'
* commit '
b6d5e6aa10a2f09351f287e876f7ed4504e1f75d':
dca: convert dca_default_coeffs to float.
Conflicts:
libavcodec/dcadata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Nov 2013 23:23:51 +0000 (00:23 +0100)]
Merge commit '
25609b63d2e07d26d610f485a22082d32c96c0f5'
* commit '
25609b63d2e07d26d610f485a22082d32c96c0f5':
dcadec: store the stereo downmix coefficients as float in the DCAContext.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Nov 2013 22:15:35 +0000 (23:15 +0100)]
Merge commit '
89de5157b1cbe7807d3ec1d51bd56a75e98c002e'
* commit '
89de5157b1cbe7807d3ec1d51bd56a75e98c002e':
dcadec: implement request_channel_layout.
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 28 Nov 2013 22:53:10 +0000 (23:53 +0100)]
doc/ffserver: mention remaining stream options
Stefano Sabatini [Thu, 28 Nov 2013 22:48:57 +0000 (23:48 +0100)]
doc/ffserver: move general stream options upwards in the list
Stefano Sabatini [Thu, 28 Nov 2013 22:48:27 +0000 (23:48 +0100)]
doc/ffserver: reorder/extend stream video encoding options
Stefano Sabatini [Thu, 28 Nov 2013 22:39:02 +0000 (23:39 +0100)]
doc/ffserver: fix bitrate unit for bitrate option
Stefano Sabatini [Thu, 28 Nov 2013 21:45:54 +0000 (22:45 +0100)]
ffserver: fix typo in comment: defaut -> default
Stefano Sabatini [Thu, 28 Nov 2013 21:45:21 +0000 (22:45 +0100)]
doc/ffserver: add notice about re-launch behavior
Stefano Sabatini [Thu, 28 Nov 2013 20:06:28 +0000 (21:06 +0100)]
doc/ffserver: document InputFormat stream option
Stefano Sabatini [Thu, 28 Nov 2013 20:05:31 +0000 (21:05 +0100)]
ffserver: factorize code setting ReadOnlyFile/File options
Stefano Sabatini [Thu, 28 Nov 2013 20:04:50 +0000 (21:04 +0100)]
ffserver: improve error feedback in open_input_stream()
Stefano Sabatini [Thu, 28 Nov 2013 18:36:31 +0000 (19:36 +0100)]
ffserver: drop stream AudioQuality option
It has no effect, and it was never documented.
Stefano Sabatini [Thu, 28 Nov 2013 17:30:03 +0000 (18:30 +0100)]
ffserver: add comment about how Launch path program is created
Stefano Sabatini [Thu, 28 Nov 2013 15:51:40 +0000 (16:51 +0100)]
ffserver: extend error handling when parsing the configuration file
In particular, abort immediately in case of memory error, avoid potential
crashes.
Stefano Sabatini [Thu, 28 Nov 2013 15:35:50 +0000 (16:35 +0100)]
ffserver: add some error handling to main()
Michael Niedermayer [Thu, 28 Nov 2013 21:47:08 +0000 (22:47 +0100)]
Merge commit '
cf7860db608df7c76471d8b61f07abbd5aad8dd5'
* commit '
cf7860db608df7c76471d8b61f07abbd5aad8dd5':
x86: dsputil: Suppress deprecation warnings for XvMC bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Nov 2013 21:00:25 +0000 (22:00 +0100)]
Merge commit '
d1916d13e28b87f4b1b214231149e12e1d536b4b'
* commit '
d1916d13e28b87f4b1b214231149e12e1d536b4b':
dsputil/pngdsp: fix signed/unsigned type in end comparison
Conflicts:
libavcodec/dsputil.c
See:
454a11a1c9c686c78aa97954306fb63453299760
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Tim Walker [Sat, 23 Nov 2013 23:15:46 +0000 (00:15 +0100)]
dcadec: add disable_xch private option.
This supplements the deprecated request_channels-based control of XCh decoding.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Tim Walker [Fri, 22 Nov 2013 21:59:54 +0000 (22:59 +0100)]
dcadec: treat all 2-channel modes as Stereo in dca_downmix.
The check for (prim_channels > 2) before calling dca_downmix made these
cases unreachable, but now 2.1 layouts will go through the downmix code.
Having dual mono, Lt/Rt and sum-difference layouts print errors when
regular Stereo doesn't seems pointless.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Tim Walker [Fri, 22 Nov 2013 22:47:03 +0000 (23:47 +0100)]
dca: support mixing LFE in dca_downmix.
Embedded downmix coefficients can use this.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Tim Walker [Fri, 22 Nov 2013 21:11:47 +0000 (22:11 +0100)]
dca: improve default stereo downmix coefficients.
Previous coefficients were producing a non-normalized, incorrect Lt/Rt downmix.
The new coefficients produce a standard Lo/Ro downmix with 3dB attenuation.
This should match the typical default coefficients used by DTS encoders.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Tim Walker [Fri, 22 Nov 2013 22:42:37 +0000 (23:42 +0100)]
dca: extract core substream's embedded downmix coeffcient codes, if present.
As per ETSI TS 102 114 V1.4.1 specification.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Tim Walker [Fri, 22 Nov 2013 19:25:57 +0000 (20:25 +0100)]
dca: remove embedded downmix coefficient extraction.
It was based on an old, seemingly incorrect specification, so default
coefficients were always used anyway.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Thu, 28 Nov 2013 20:52:46 +0000 (21:52 +0100)]
library.mak: only run asm strip if ASMSTRIP flags are set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tim Walker [Fri, 22 Nov 2013 19:19:55 +0000 (20:19 +0100)]
dca: convert dca_default_coeffs to float.
Easier to read, modify, and avoids relying on an outdated table.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Tim Walker [Fri, 22 Nov 2013 19:17:57 +0000 (20:17 +0100)]
dcadec: store the stereo downmix coefficients as float in the DCAContext.
The 7-bit codes previously used are absent from the ETSI 102 114 V1.4.1 spec.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Thu, 28 Nov 2013 20:35:12 +0000 (21:35 +0100)]
configure: remove code that disables striping in the absence of some flags
This prevents breaking (non asm) striping in that case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Nov 2013 20:29:13 +0000 (21:29 +0100)]
build sys: rename STRIPFLAGS to ASMSTRIPFLAGS
This more closely matches the actual use, also we use plain
strip without these flags for striping
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Nov 2013 20:27:05 +0000 (21:27 +0100)]
Merge commit '
0673ede985a6560e7efb86dab1c58fb7f95ce587'
* commit '
0673ede985a6560e7efb86dab1c58fb7f95ce587':
configure: add strip flags checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Tim Walker [Sat, 23 Nov 2013 22:36:21 +0000 (23:36 +0100)]
dcadec: implement request_channel_layout.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Thu, 28 Nov 2013 19:02:16 +0000 (20:02 +0100)]
doc/ffserver: fix documentation for CustomLog
Stefano Sabatini [Thu, 28 Nov 2013 18:34:14 +0000 (19:34 +0100)]
doc/ffserver: extend documentation for VideoBitRateRange
Stefano Sabatini [Thu, 28 Nov 2013 18:33:07 +0000 (19:33 +0100)]
doc/ffserver: clarify/extend documentation about status streams
Stefano Sabatini [Thu, 28 Nov 2013 18:14:38 +0000 (19:14 +0100)]
doc/ffserver: move ACL syntax section before the global option sections
Stefano Sabatini [Thu, 28 Nov 2013 17:49:27 +0000 (18:49 +0100)]
doc/ffserver: document "Launch" feed option
Stefano Sabatini [Thu, 28 Nov 2013 17:55:11 +0000 (18:55 +0100)]
doc/ffserver: fix documentation for -n option
Launch option is defined in the Feed section.
Stefano Sabatini [Thu, 28 Nov 2013 17:54:41 +0000 (18:54 +0100)]
doc/ffserver: extend documentation for CustomLog option
Stefano Sabatini [Thu, 28 Nov 2013 16:27:37 +0000 (17:27 +0100)]
doc/ffserver: fix RTPS -> RTSP ttypo
Spotted-by: lazy ubitux
Stefano Sabatini [Thu, 28 Nov 2013 16:27:01 +0000 (17:27 +0100)]
doc/ffserver: clearly specify whence ffserver reads the configuration file
Stefano Sabatini [Thu, 28 Nov 2013 16:11:10 +0000 (17:11 +0100)]
doc/ffserver: add notice about case-insensitiveness
Stefano Sabatini [Thu, 28 Nov 2013 16:08:45 +0000 (17:08 +0100)]
doc/ffserver: remove tip about MaxBandwidth
Should be redundant now that the option is documented.
Stefano Sabatini [Thu, 28 Nov 2013 16:07:19 +0000 (17:07 +0100)]
doc/ffserver: specify default value for Preroll
Stefano Sabatini [Thu, 28 Nov 2013 15:42:42 +0000 (16:42 +0100)]
doc/ffserver: document NoDaemon deprecated option
Stefano Sabatini [Thu, 28 Nov 2013 15:42:07 +0000 (16:42 +0100)]
doc/ffserver: improve rendering for -n option text
Stefano Sabatini [Thu, 28 Nov 2013 09:58:32 +0000 (10:58 +0100)]
doc/ffserver: remove "What can this do?" section
The section shows only a limited use case, contains only redundant
information, and various mysterious mentions about things which don't
work correctly.
Stefano Sabatini [Thu, 28 Nov 2013 09:56:36 +0000 (10:56 +0100)]
doc/ffserver: use @command{} for specifying ffserver
Stefano Sabatini [Thu, 28 Nov 2013 09:49:56 +0000 (10:49 +0100)]
doc/ffserver: remove more pointless/outdated entries
Mentioning build options, or bugs, or mysterious limitations should not
be done in the manual.
Diego Biurrun [Mon, 25 Nov 2013 18:57:13 +0000 (18:57 +0000)]
x86: dsputil: Suppress deprecation warnings for XvMC bits
These parts are scheduled for removal on the next version bump.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Fri, 30 Aug 2013 21:14:32 +0000 (23:14 +0200)]
dsputil/pngdsp: fix signed/unsigned type in end comparison
Fixes out of array accesses and integer overflows.
Vittorio Giovara [Mon, 25 Nov 2013 08:46:14 +0000 (08:46 +0000)]
configure: add strip flags checks
This will check if -wN '..@*' is available and fall back on -x if not;
when none are available, do not run strip at all to prevent removing
functions that might be actually needed.
Clément Bœsch [Thu, 28 Nov 2013 13:10:34 +0000 (14:10 +0100)]
doc/Makefile: cosmetics after previous commits.
Clément Bœsch [Thu, 28 Nov 2013 13:08:06 +0000 (14:08 +0100)]
doc/examples: update README.
Clément Bœsch [Thu, 28 Nov 2013 13:06:57 +0000 (14:06 +0100)]
build: also clean the examples with debug symbols
Clément Bœsch [Thu, 28 Nov 2013 12:56:08 +0000 (13:56 +0100)]
build: split examples cleaning out of docclean.
Clément Bœsch [Thu, 28 Nov 2013 12:55:34 +0000 (13:55 +0100)]
build: integrate remaining examples.
Clément Bœsch [Thu, 28 Nov 2013 12:54:44 +0000 (13:54 +0100)]
doc/examples: make fill_samples static.
This is required to build with FFmpeg compilation options.
Clément Bœsch [Thu, 28 Nov 2013 12:19:33 +0000 (13:19 +0100)]
Add transcode_aac example to .gitignore.
Clément Bœsch [Thu, 28 Nov 2013 12:18:58 +0000 (13:18 +0100)]
doc/examples: add transcode_aac to local Makefile.
Michael Niedermayer [Thu, 28 Nov 2013 09:57:14 +0000 (10:57 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h263dec: sanitize a condition.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Nov 2013 09:21:37 +0000 (10:21 +0100)]
Merge commit '
4d388c0cd05dd4de545e8ea333ab4de7d67ad12d'
* commit '
4d388c0cd05dd4de545e8ea333ab4de7d67ad12d':
h264_refs: make sure not to write over the bounds of the default ref list
Conflicts:
libavcodec/h264_refs.c
This condition should be impossible and was checked for by asserts.
the asserts are moved up in this merge to gurantee that no out of array
access can happen even if the state is "impossible".
Also if such impossible states could somehow be created, that should
be dealt with and not silently ignored.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 25 Nov 2013 00:40:05 +0000 (16:40 -0800)]
doc/default.css: sync with ffmpeg-web
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Stefano Sabatini [Wed, 27 Nov 2013 13:42:07 +0000 (14:42 +0100)]
doc/ffserver: remove outdated troubleshoot entry about audio
Stefano Sabatini [Wed, 27 Nov 2013 12:56:33 +0000 (13:56 +0100)]
ffserver: clarify feedback in case of wrong AVOptionAudio/Video error
Stefano Sabatini [Wed, 27 Nov 2013 11:09:27 +0000 (12:09 +0100)]
doc/ffserver: document configuration syntax
While still incomplete, this is better than nothing at all.
Michael Niedermayer [Thu, 28 Nov 2013 01:28:50 +0000 (02:28 +0100)]
ffmpeg: set VCFR when copying timestamps
This fixes unreasonable initial frame repeats
Fixes Ticket3176
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Nov 2013 23:19:45 +0000 (00:19 +0100)]
Revert "configure: add #include "version.h" to config.h"
This reverts commit
ca21116b3f53a9bdd74364bfab9cde70a044b165.
Revert suggested by Jamal:
"Bad secondary effect i just noticed: Every time version.h is changed
(git pull for example), anything that includes config.h will be
recompiled. And that means pretty much every single file in the tree.
"
Timothy Gu [Tue, 26 Nov 2013 22:43:18 +0000 (14:43 -0800)]
configure: add #include "version.h" to config.h
Avoid clash with version.h of the libraries.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 26 Nov 2013 10:07:22 +0000 (11:07 +0100)]
h263dec: sanitize a condition.
Call ff_mpeg4_decode_picture_header() only when the decoder has the
MPEG4 codec id, not based on a vaguely related value of h263_pred.
Anton Khirnov [Fri, 15 Nov 2013 18:06:23 +0000 (19:06 +0100)]
h264_refs: make sure not to write over the bounds of the default ref list
Fixes invalid writes.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Michael Niedermayer [Wed, 27 Nov 2013 16:29:11 +0000 (17:29 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/platform: Update to reflect current MSVC build situation
Conflicts:
doc/platform.texi
See:
ec0b0c2b5875e4cb58ea19f82db6574774256e9d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Nov 2013 16:04:05 +0000 (17:04 +0100)]
avutil/log: check that len is within the buffer before reading it
Fixes out of array read
Fixes: asan_heap-oob_19d6979_6857_mmw_deadzy.ogg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 27 Nov 2013 13:04:41 +0000 (14:04 +0100)]
doc/ffmpeg: use @command{} for programs mentioned in -override_ffserver
Stefano Sabatini [Wed, 27 Nov 2013 12:55:11 +0000 (13:55 +0100)]
ffserver: factorize opt_audio/video_codec
Simplify.
Michael Niedermayer [Wed, 27 Nov 2013 13:33:52 +0000 (14:33 +0100)]
avcodec/qpeg: make qpeg_decode_inter() noinline
This should workaround an apparent mis-compilation with gcc 4.2 on BSD
The function is rarely called and not inlining should have no speed
effect
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Mon, 25 Nov 2013 13:45:35 +0000 (13:45 +0000)]
doc/platform: Update to reflect current MSVC build situation
Also update the C99 converter URL, since it uses GitHub Releases
to host the binaries now.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 25 Nov 2013 13:45:35 +0000 (13:45 +0000)]
doc/platform: Update to reflect current MSVC build situation
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Wed, 27 Nov 2013 10:22:19 +0000 (11:22 +0100)]
doc/examples/transcode_aac: remove non converted codepath
This codepath is not implemented and just crashes, also its simpler
without special cases, which makes sense for an example
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Nov 2013 10:15:48 +0000 (11:15 +0100)]
doc/examples/transcode_aac: switch to swresample
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Nov 2013 09:52:26 +0000 (10:52 +0100)]
get_audio_buffer: fix usage where channels are not set but layout is
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Nov 2013 09:52:05 +0000 (10:52 +0100)]
doc/examples/transcode_aac: fix project name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Nov 2013 09:30:37 +0000 (10:30 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add an audio transcoding example.
Conflicts:
configure
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sun, 24 Nov 2013 01:35:33 +0000 (02:35 +0100)]
lavd/pulse_audio_enc: add buffer size control options
Add options to control the size of the PulseAudio buffer.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Andreas Unterweger [Tue, 8 Oct 2013 11:10:46 +0000 (13:10 +0200)]
Add an audio transcoding example.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Wed, 27 Nov 2013 01:35:38 +0000 (02:35 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Check for pod2man instead of perl for manual page generation
Conflicts:
configure
doc/Makefile
The code that this changes is mostly not part of ffmpeg
thus only a few whitespaces end up being merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Nov 2013 01:26:03 +0000 (02:26 +0100)]
Merge commit '
4da3f410d176dd1a55d7cbe5d2e2ead342027f13'
* commit '
4da3f410d176dd1a55d7cbe5d2e2ead342027f13':
configure: Restore doc option to disable building the documentation
Conflicts:
configure
See:
eff2edae562096c1e21e8c048392ffe8968181f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Nov 2013 01:23:55 +0000 (02:23 +0100)]
doc/Makefile: fix building examples if a program suffix is set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Nov 2013 00:52:55 +0000 (01:52 +0100)]
Merge commit '
dc80e2f7a529d6e4416b40b68699be16fed62d6c'
* commit '
dc80e2f7a529d6e4416b40b68699be16fed62d6c':
Makefile: Fix building programs on systems with a nonempty executable suffix
Conflicts:
Makefile
See:
f1db007e008d3ece791c7ac65c537d1d301ea0cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>