| Commit message (Collapse) | Author | Age |
| |
|
|
|
|
|
| |
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
|
|
|
|
|
| |
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
|
|
|
|
| |
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
|
| |
|
|
|
|
| |
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* qatar/master:
doc: document the asf demuxer
Conflicts:
doc/demuxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| | |
And drop a typo from the previous FLV entry.
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit '21015109ec0fac0f104a5355f272ecb956ba3f4e':
doc: Document the flv demuxer
Conflicts:
doc/demuxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| | |
|
| |
| |
| |
| | |
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
| |
| |
| |
| | |
Address trac ticket #2884.
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b':
movenc: add faststart option for web streaming
Conflicts:
doc/muxers.texi
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| |
| |
| |
| | |
Faststart moves the moov atom to the beginning of the file and rewrites
the rest of the file after muxing is complete.
Signed-off-by: Martin Storsjö <martin@martin.st>
|
| |
| |
| |
| | |
The example shows how to combine bsfs and select options.
|
| | |
|
| |
| |
| |
| |
| |
| | |
Fixes warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit '545a0b807cf45b2bbc4c9087a297b741ce00f508':
vf_fps: add 'start_time' option
Conflicts:
doc/filters.texi
libavfilter/vf_fps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| | |
This allows for dropping or duplication to match a particular start time.
|
| |
| |
| |
| | |
This reverts commit 3aa2257d240a5a0eb94014b9113dd91730786886.
|
| |
| |
| |
| |
| | |
This allows to apply different bitstream filters to different outputs,
with no need to transcode.
|
| |
| |
| |
| | |
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
| |
| |
| |
| |
| |
| |
| | |
With this all AVOptions from swscale can be set without each needing
changes to vf_scale.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This allows specifying more dither algorithms without using up flags and
without ambiguities.
Also initialize the new field based on the flags and use it.
Note, improving the logic of the checks is left to subsequent
commits, this here only switches from flags to enum.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| | |
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
| |
| |
| |
| | |
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
|
| |
| |
| |
| | |
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| | |
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Using VDPAU correctly means checking for preemption
and possibly regenerating the context all the time.
With the current API there is no context or other
user-defined pointer and thus this in not possible
during decoding unless using some hack like global
variables.
The need to reinitialize both surfaces and even function
pointers makes handling preemption even more difficult.
This patch introduces a new render2 function that gets
both the AVCodecContext and AVFrame in addition,
in both the user can store additional opaque data.
This allows even advanced approaches like keeping a
"generation counter" for the surfaces so they can be
regenerated on the fly and efficiently.
In addition, the function has a return value that will
be passed through all the way instead of being silently
ignored as for the current render function.
Unfortunately the HWAccel API has no way of providing
API/ABI compatibility, so a currently disallowed
state (render pointer being NULL) is used to extend it.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
|
| |
| |
| |
| | |
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
doc: Clarify the avconv section about -re
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| | |
Signed-off-by: Martin Storsjö <martin@martin.st>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
* commit 'd175a5730b42166704b7262b33f4b780d9d92f60':
doc: Add an example on publishing over RTMP
doc: Add librtmp to the section header for the librtmp specific details
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| | |
Signed-off-by: Martin Storsjö <martin@martin.st>
|
| |
| |
| |
| | |
Signed-off-by: Martin Storsjö <martin@martin.st>
|
|\|
| |
| |
| |
| |
| |
| | |
* commit 'a435ca5b4d9efebf0759220681010977c36615f7':
doc: Explain that the default RTMP user agent is different when publishing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The fact that a different user agent is used is cruicial for getting
publishing authentication working. (When using librtmp, this other
user agent has to be specified manually, but that's not needed
with the libavformat internal RTMP support.)
Signed-off-by: Martin Storsjö <martin@martin.st>
|
|\|
| |
| |
| |
| |
| |
| | |
* commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec':
doc: Extend the rtmp example to include how to pass username/password
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| | |
Signed-off-by: Martin Storsjö <martin@martin.st>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d':
lavc: Add refcounted api to AVPacket
Conflicts:
libavcodec/avpacket.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| | |
Provide a clean way to manipulate packets.
|
| |
| |
| |
| | |
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
The first sentence of each of the modified man pages are worded a bit
awkwardly. These minor copy-edits should make them clearer.
Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit '3e5898782dce60334ab294821ca00b19c648cf66':
Voxware MetaSound decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit '605387582bd35920b83a26dabbe1c0601f425621':
lavf: Support unix sockets
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit 'bc54c2ae3ca6abd225dc331eafc12108513158de':
libx264: add shortcut for the bluray compatibility option
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|