Commits · 47ee6f1a59b1f345f4f9d8e79c30d66df12b72e7 · Linshizhi / ffmpeg.wasm-core

08 Aug, 2016 1 commit
- cmdutils: remove the current working directory from the DLL search path on win32 · 3bf142c7
  Hendrik Leppkes authored 8 years ago
```
Reviewed-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
  3bf142c7
26 May, 2016 1 commit

ffserver: fixed deallocation bug in build_feed_streams · d970f7ba

Gregor Riepl authored 8 years ago

Signed-off-by: Gregor Riepl <onitake@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

d970f7ba

08 Mar, 2016 1 commit
- ffserver: Fixed ffserver to support large ffm files · baec6d8a
  Lior Mualem authored 9 years ago
```
ffm_read_write_index returns a 64bit value,

Github: Closes #185
```
  baec6d8a
21 Feb, 2016 1 commit

ffserver&ffm: Fixed issues preventing ffserver write_index and files_size from... · a2f8beef

Oliver Collyer authored 9 years ago

ffserver&ffm: Fixed issues preventing ffserver write_index and files_size from being set correctly which was breaking ffserver streaming.

I discovered that ffserver streaming was broken (it seems like it has been since 20th November) and I opened a ticket for this (https://trac.ffmpeg.org/ticket/5250 <https://trac.ffmpeg.org/ticket/5250>).

I spent yesterday learning git bisect (with the kind help of cehoyos) to painstakingly track down the cause. This was made more difficult due to the presence of a segfault in ffserver during the period where the bug was introduced so I first had to identify when and how that was fixed and then retrospectively apply that fix again for each step of the second git bisect to find the actual bug.

Anyway, the fruits of my labour are the innocent looking patch below to correct a couple of typos and define a valid range for two variables.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

a2f8beef

29 Dec, 2015 1 commit
- ffserver: Cast time_t value when using it in a format string. · e5c16e38
  Carl Eugen Hoyos authored 9 years ago
```
Fixes ticket #5103.
```
  e5c16e38
27 Dec, 2015 3 commits

ffserver: add a doctype heading to our HTML pages · b25ac3c9
Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
b25ac3c9

ffserver: HTML encode msgs instead of blindly stripping chars out · daaa5358

Reynaldo H. Verdejo Pinochet authored 9 years ago

Fixes weirdness like our "??filename? not found" 404.

None of the chars being used from the previously blacklisted
list needs to be scaped on an UTF-8 document context
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

daaa5358

ffserver: make our 404 explicitly HTML5/UTF-8 · 0e5c1dc9
Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
0e5c1dc9

19 Dec, 2015 3 commits

ffserver: refactor build_feed_streams() · ae2ed20b

Reynaldo H. Verdejo Pinochet authored 9 years ago

* Avoid excesive nesting that made it really hard to follow
* Drop unneeded vars
* Factor out codec compatibility check routine
* Ensure inputs are closed and contexts are freed as needed
  before returning
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ae2ed20b

ffserver: refactor build_file_streams() · 4ba148a6

Reynaldo H. Verdejo Pinochet authored 9 years ago

Avoid unneeded nesting, drop redundant var
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

4ba148a6

ffserver: unify exit path from build_feed_streams() · 532a2833

Reynaldo H. Verdejo Pinochet authored 9 years ago

Exit from main on build_feed_streams() failures & use
standard EXIT_ codes on error out/normal exit.
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

532a2833

15 Dec, 2015 5 commits
- ffserver: explicitly use time_t for uptime calc · 0bdf84b6
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  0bdf84b6
- ffserver: free pathname before bailing out · dadb9514
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  dadb9514
- ffserver: use EXIT_FAILURE on failed child fork() · 1fa81430
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  1fa81430
- ffserver: be explicit on failed fork() msg · eb68c356
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  eb68c356
- ffserver: allocate AVStream's internal too · 5a31f231
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Avoids segfault at init_muxer() (mux.c) due to a
null pointer dereference on the recently
introduced AVStream->internal

Fixes: #5059 (https://trac.ffmpeg.org/ticket/5059)
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  5a31f231
30 Nov, 2015 2 commits

ffserver: Clear avio context after closing it in rtp_new_av_stream() · a00cc2e4

Michael Niedermayer authored 9 years ago

Suggested-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

a00cc2e4

ffserver: Clear avio context after closing it · 40063a90

Michael Niedermayer authored 9 years ago

Fixes: ==13287== Invalid read of size 4
==13287==    at 0x45161A: flush_buffer (aviobuf.c:143)
==13287==    by 0x451971: avio_flush (aviobuf.c:200)
==13287==    by 0x512CCF: av_write_trailer (mux.c:1016)
==13287==    by 0x41A5E0: close_connection (ffserver.c:853)
==13287==    by 0x421EDC: rtsp_cmd_interrupt (ffserver.c:3245)
==13287==    by 0x420B9C: rtsp_parse_request (ffserver.c:2854)
==13287==    by 0x41A9C2: handle_connection (ffserver.c:930)
==13287==    by 0x41A04B: http_server (ffserver.c:700)
==13287==    by 0x423A60: main (ffserver.c:3897)
==13287==  Address 0xb6cd258 is 88 bytes inside a block of size 192 free'd
==13287==    at 0x4C2B5D9: free (vg_replace_malloc.c:446)
==13287==    by 0x1004DAC: av_free (mem.c:239)
==13287==    by 0x454835: avio_close_dyn_buf (aviobuf.c:1170)
==13287==    by 0x41F385: http_prepare_data (ffserver.c:2368)
==13287==    by 0x41F59B: http_send_data (ffserver.c:2416)
==13287==    by 0x41ABE2: handle_connection (ffserver.c:986)
==13287==    by 0x41A04B: http_server (ffserver.c:700)
==13287==    by 0x423A60: main (ffserver.c:3897)
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

40063a90

29 Nov, 2015 1 commit
- ffserver: add NULL context to ff_rtsp_parse_line(). · 15206ffd
  Nicolas George authored 9 years ago
```
Needed after f62fe535/2c17fb61.
```
  15206ffd
20 Nov, 2015 1 commit

ffserver: Use AVOption API to access ffm demuxer instead of direct access depending on ABI · e33d3720

Michael Niedermayer authored 9 years ago

server_attached is newly added so the demuxer knows if there is an attached server
that can update the write index. This is needed to fix a infinite loop
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

e33d3720

11 Nov, 2015 2 commits
- ffserver: Replace one malloc(AVStream) by avformat_new_stream() · 2ec18db7
  Michael Niedermayer authored 9 years ago
```
This fixes a null pointer dereference from the recently introduced
AVStream->internal
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
  2ec18db7
- ffserver: Do not add or rescale AV_NOPTS_VALUE from the demuxer · 64e220be
  Michael Niedermayer authored 9 years ago
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
  64e220be
10 Nov, 2015 1 commit

ffserver: fix incorrect strlcpy usage · 6c2dbff7

Ganesh Ajjanagadde authored 9 years ago

Somewhat ironic that this "safe" interface is actually being used
unsafely here. This fixes the usage preventing potential null pointer
dereference, where the old code was doubly broken: ctime can return
NULL, and ctime can return an arbitrarily long buffer.
Reviewed-by: Mark Harris <mark.hsj@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

6c2dbff7

27 Oct, 2015 1 commit
- Replace remaining occurances of av_free_packet with av_packet_unref · c2f861ca
  Hendrik Leppkes authored 9 years ago
  
  c2f861ca
05 Oct, 2015 1 commit
- ffserver: avoid leaking pathname at exit · fe95b0eb
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Fixes Coverity CID 1325681
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  fe95b0eb
04 Oct, 2015 4 commits
- ffserver: fix up rate units in server messages · 84b4998d
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  84b4998d
- ffserver: wrap around bandwidth exceeded msg text · d8c714cb
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  d8c714cb
- ffserver: wrap around too-busy message text · 8a908994
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  8a908994
- ffserver: unify exit path in _write_index() · 3388bcce
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  3388bcce
18 Sep, 2015 2 commits
- ffserver: explicitly free() duped filename · c677b42f
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  c677b42f
- ffserver: start dropping all unneededly harcoded str lengths · fb349359
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  fb349359
15 Sep, 2015 1 commit
- lavc: Switch bitrate to 64bit unless compatibility with avconv was requested. · 7404f3bd
  Michael Niedermayer authored 9 years ago
  
  7404f3bd
12 Sep, 2015 3 commits
- ffserver: remove redundant comment, clarify another one · 314bc20d
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  314bc20d
- ffserver: unify exit path in http_server() · 2580395e
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  2580395e
- ffserver: unify fail path in socket_open_listen() · 9a168e93
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  9a168e93
21 Aug, 2015 1 commit

ffserver: cast PID to int64_t before printing · 92b1a0fa

Ganesh Ajjanagadde authored 9 years ago

Unfortunately, there is no portable format specifier for PID's.
Furthermore, it is not safe to assume pid_t <= 32 bit in size,
see e.g http://unix.derkeiler.com/Mailing-Lists/AIX-L/2010-08/msg00008.html.
Right now, it is ok to assume pid_t <= 32 bit in size, but this may change in the future.
Also, this patch fixes warning due to lack of an appropriate cast from
http://fate.ffmpeg.org/report.cgi?time=20150820233505&slot=x86-opensolaris-gcc4.3.
Note that this method of handling pid_t is in line with what nginx does.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

92b1a0fa

27 Jul, 2015 4 commits
- ffserver: add (), fix order of operations · c719b7a4
  Michael Niedermayer authored 9 years ago
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
  c719b7a4
- ffserver: drop superfluous else clause · b16b8c81
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  b16b8c81
- ffserver: simplify assignment with ternary · c75bc268
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  c75bc268
- ffserver: move decl to start of func · 2ea642ff
  Reynaldo H. Verdejo Pinochet authored 9 years ago
```
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
```
  2ea642ff