We already have a dependency on awk and bc is sometimes not found in the
base system.
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6)
Conflicts:
doc/platform.texi
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 10fd7ff814f2a35b5b49a9c3b0d426ead6c7e83f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
s->listen_timeout is passed to ff_listen_bind(), which accepts a timeout
value expressed in milliseconds.
The unit was incorrectly set in 1b4da43ce02452843a1e9bb976da1a39e18a945c.
(cherry picked from commit 6db20926c32ea297418f1f819585007c6b7b6160)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1b3a98f137900b6c3eb9a4c177d0b25684d6d144)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit '40c7613ecf2f3f7565309f9780183228605c3684':
doc: Fix syntax and logical errors in avconv stream combination example
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Fixed CID1197052
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 419800acc46afc0c3b7319d6e216d0da207ebbb7)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d473f2d18aef6731526324d28008874fac05f593)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cf3bfc970c7a567763aef4bf7ce827f84d692fd6)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
See Ticket3486
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 575b957758670d6094e9095acfcc24e4e32fc4a7)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit '0f42e06651c9c4d7581b70b9ad2b160c2525094f':
doc: Point to the correct, actually maintained gas-preprocessor repo
Conflicts:
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit d15c536123a44362ace6299c391a492c90b83fc7)
Signed-off-by: Martin Storsjö <martin@martin.st>
* commit 'cd874cf8e69f1b31986fd978577994b45efa3d5c':
http: Allow setting a Content-Type for POST requests
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '991e6fa35b4ad2df389ba7e1c2c58d064e295c76':
http: Add support for selecting a request range
Conflicts:
doc/protocols.texi
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Comment from Reimar Döffinger included as pro memoria.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 2ec33d27127251bbc45e1f88e60691ad59cf2319)
Contextually make the default User-Agent use the common
"Name/Version" pattern.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ddfc98906373d1f17f6205cedd14c68d7a75995f)
Export the metadata as a icy_metadata_packet avoption.
Based on the work of wm4 and Alessandro Ghedini.
Bug-Id: https://bugs.debian.org/739936
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab)
docs say:
'A document having more than one "=encoding" line should be considered an error. '
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 12ce58bebdff6bfae9c56dc785e3003968f93277)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg provides local copies of these headers in compat/avisynth/,
and there is no restriction against using 2.5.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5336cd6374c7cbba9d6e65de1cec9404efcb665f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3':
doc: Add section about AviSynth support
Conflicts:
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
