RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
58,554 Commits 36 Branches 398 Tags 239 MiB
Commit Graph

58554 Commits

Author SHA1 Message Date
Stefano Sabatini ab89d2dd2a ffserver: fix typo in comment: defaut -> default 2013-11-28 23:13:46 +01:00
Stefano Sabatini 6aea3d597e doc/ffserver: add notice about re-launch behavior 2013-11-28 23:13:46 +01:00
Stefano Sabatini 2a0349786a doc/ffserver: document InputFormat stream option 2013-11-28 23:13:45 +01:00
Stefano Sabatini 77f5cb92af ffserver: factorize code setting ReadOnlyFile/File options 2013-11-28 23:13:45 +01:00
Stefano Sabatini 0e1e5d0053 ffserver: improve error feedback in open_input_stream() 2013-11-28 23:13:45 +01:00
Stefano Sabatini ddab41995f ffserver: drop stream AudioQuality option 
It has no effect, and it was never documented.
 2013-11-28 23:13:45 +01:00
Stefano Sabatini 4f60d53b18 ffserver: add comment about how Launch path program is created 2013-11-28 23:13:45 +01:00
Stefano Sabatini 7cbbc4f7e7 ffserver: extend error handling when parsing the configuration file 
In particular, abort immediately in case of memory error, avoid potential
crashes.
 2013-11-28 23:13:45 +01:00
Stefano Sabatini 04702a0d3d ffserver: add some error handling to main() 2013-11-28 23:13:45 +01:00
Michael Niedermayer 3adb825650 Merge commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5' 
* commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5':
  x86: dsputil: Suppress deprecation warnings for XvMC bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-28 22:47:37 +01:00
Michael Niedermayer f21ca39e81 Merge commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b' 
* commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b':
  dsputil/pngdsp: fix signed/unsigned type in end comparison

Conflicts:
	libavcodec/dsputil.c

See: 454a11a1c9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-28 22:02:55 +01:00
Michael Niedermayer e975c147e1 library.mak: only run asm strip if ASMSTRIP flags are set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-28 21:52:46 +01:00
Michael Niedermayer 191454f26e 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>
 2013-11-28 21:35:12 +01:00
Michael Niedermayer e283c26c35 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>
 2013-11-28 21:29:13 +01:00
Michael Niedermayer 71b95f2ab6 Merge commit '0673ede985a6560e7efb86dab1c58fb7f95ce587' 
* commit '0673ede985a6560e7efb86dab1c58fb7f95ce587':
  configure: add strip flags checks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-28 21:27:17 +01:00
Stefano Sabatini 58010e57b2 doc/ffserver: fix documentation for CustomLog 2013-11-28 20:17:15 +01:00
Stefano Sabatini 805b607484 doc/ffserver: extend documentation for VideoBitRateRange 2013-11-28 20:17:10 +01:00
Stefano Sabatini bcbf8920ed doc/ffserver: clarify/extend documentation about status streams 2013-11-28 20:17:00 +01:00
Stefano Sabatini 312d075e5d doc/ffserver: move ACL syntax section before the global option sections 2013-11-28 20:16:53 +01:00
Stefano Sabatini 4e39962f0c doc/ffserver: document "Launch" feed option 2013-11-28 20:16:46 +01:00
Stefano Sabatini 07315da149 doc/ffserver: fix documentation for -n option 
Launch option is defined in the Feed section.
 2013-11-28 18:59:29 +01:00
Stefano Sabatini 1ee9341a70 doc/ffserver: extend documentation for CustomLog option 2013-11-28 18:59:21 +01:00
Stefano Sabatini 2121945770 doc/ffserver: fix RTPS -> RTSP ttypo 
Spotted-by: lazy ubitux
 2013-11-28 17:28:27 +01:00
Stefano Sabatini b89983c4ea doc/ffserver: clearly specify whence ffserver reads the configuration file 2013-11-28 17:28:22 +01:00
Stefano Sabatini bb097d037c doc/ffserver: add notice about case-insensitiveness 2013-11-28 17:13:40 +01:00
Stefano Sabatini e79f299caf doc/ffserver: remove tip about MaxBandwidth 
Should be redundant now that the option is documented.
 2013-11-28 17:13:35 +01:00
Stefano Sabatini 398479050e doc/ffserver: specify default value for Preroll 2013-11-28 17:13:27 +01:00
Stefano Sabatini 2989281d4d doc/ffserver: document NoDaemon deprecated option 2013-11-28 17:03:09 +01:00
Stefano Sabatini 0003379926 doc/ffserver: improve rendering for -n option text 2013-11-28 17:03:09 +01:00
Stefano Sabatini 6dc90334e3 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.
 2013-11-28 17:03:09 +01:00
Stefano Sabatini 80193a12e0 doc/ffserver: use @command{} for specifying ffserver 2013-11-28 17:03:09 +01:00
Stefano Sabatini 39192b76f8 doc/ffserver: remove more pointless/outdated entries 
Mentioning build options, or bugs, or mysterious limitations should not
be done in the manual.
 2013-11-28 17:03:08 +01:00
Diego Biurrun cf7860db60 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>
 2013-11-28 16:04:30 +01:00
Michael Niedermayer d1916d13e2 dsputil/pngdsp: fix signed/unsigned type in end comparison 
Fixes out of array accesses and integer overflows.
 2013-11-28 15:37:55 +01:00
Vittorio Giovara 0673ede985 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.
 2013-11-28 15:37:10 +01:00
Clément Bœsch 01c9d8094a doc/Makefile: cosmetics after previous commits. 2013-11-28 14:10:34 +01:00
Clément Bœsch 0d2c832445 doc/examples: update README. 2013-11-28 14:08:06 +01:00
Clément Bœsch 1d751768f3 build: also clean the examples with debug symbols 2013-11-28 14:06:57 +01:00
Clément Bœsch fe318e143b build: split examples cleaning out of docclean. 2013-11-28 13:56:08 +01:00
Clément Bœsch 1a88e84fd5 build: integrate remaining examples. 2013-11-28 13:55:34 +01:00
Clément Bœsch a8ac2a1530 doc/examples: make fill_samples static. 
This is required to build with FFmpeg compilation options.
 2013-11-28 13:54:44 +01:00
Clément Bœsch 245931885f Add transcode_aac example to .gitignore. 2013-11-28 13:19:50 +01:00
Clément Bœsch e5102feb6b doc/examples: add transcode_aac to local Makefile. 2013-11-28 13:19:50 +01:00
Michael Niedermayer 03beb5792a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h263dec: sanitize a condition.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-28 11:21:52 +01:00
Michael Niedermayer 0a5ca63c24 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>
 2013-11-28 10:45:53 +01:00
Timothy Gu a212d66c2a doc/default.css: sync with ffmpeg-web 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-11-28 10:27:25 +01:00
Stefano Sabatini 15f2cac018 doc/ffserver: remove outdated troubleshoot entry about audio 2013-11-28 10:19:12 +01:00
Stefano Sabatini f7fbb7ac99 ffserver: clarify feedback in case of wrong AVOptionAudio/Video error 2013-11-28 10:19:03 +01:00
Stefano Sabatini c4a03ac3b8 doc/ffserver: document configuration syntax 
While still incomplete, this is better than nothing at all.
 2013-11-28 10:18:55 +01:00
Michael Niedermayer 738ebb4a0e ffmpeg: set VCFR when copying timestamps 
This fixes unreasonable initial frame repeats
Fixes Ticket3176

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-28 02:28:50 +01:00