- 18 Apr, 2013 28 commits
-
-
Marton Balint authored
Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Reimar Döffinger authored
Regression since c10d498b. Unfortunately ff_thread_get_format can only be called from a separate decode thread, running it during init will fail. Fixes for that are welcome, for now just revert back to calling avctx->get_format directly, which is correct but having to decide on a case-by-case basis which approach to use is a bit messy. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
-
Michael Niedermayer authored
* cigaes/master: ffmpeg: make -aspect work with -vcodec copy. lavfi/vf_aspect: improve compatibility of parsing. Merged-by: Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
When a file appears to start with a id3 tag and appears to also be something else, then try to increase the probe buffer size if its below its limit. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Stefano Sabatini authored
In particular, fix crash with: ffplay -f lavfi mptestsrc,vflip
-
Clément Bœsch authored
Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA markup is muxed in a standalone .ass/.ssa file. This means the AVPacket data starts with a "Dialogue:" string, followed by a timing information (start and end of the event as string) and a trailing CRLF after each line. One packet can contain several lines. We'll refer to this layout as "SSA" or "SSA lines". In matroska, this markup is not stored as such: it has no "Dialogue:" prefix, it contains a ReadOrder field, the timing information is not in the payload, and it doesn't contain the trailing CRLF. See [1] for more info. We'll refer to this layout as "ASS". Since we have only one common codec for both formats, the matroska demuxer is constructing an AVPacket following the "SSA lines" format. This causes several problems, so it was decided to change this into clean ASS packets. Some insight about what is changed or unchanged in this commit: CODECS ------ - the decoding process still writes "SSA lines" markup inside the ass fields of the subtitles rectangles (sub->rects[n]->ass), which is still the current common way of representing decoded subtitles markup. It is meant to change later. - new ASS codec id: AV_CODEC_ID_ASS (which is different from the legacy AV_CODEC_ID_SSA) - lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of "ass") for consistency with the codec id and allows to add a real ass decoder. This ass decoder receives clean ASS lines (so it starts with a ReadOrder, is followed by the Layer, etc). We make sure this is decoded properly in a new ass-line rectangle of the decoded subtitles (the ssa decoder OTOH is doing a simple straightforward copy). Using the packet timing instead of data string makes sure the ass-line now contains the appropriate timing. - lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed into "ssa" (instead of "ass") for consistency with the codec id, and allows to add a real "ass" encoder. One important thing about this encoder is that it only supports one ass rectangle: we could have put several dialogue events in the AVPacket (separated by a \0 for instance) but this would have cause trouble for the muxer which needs not only the start time, but also the duration: typically, you have merged events with the same start time (stored in the AVPacket->pts) but a different duration. At the moment, only the matroska do the merge with the SSA-line codec. We will need to make sure all the decoders in the future can't add more than one rectangle (and only one Dialogue line in it obviously). FORMATS ------- - lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets. In the case of ASS packets as input, it adds the timing based on the AVPacket pts and duration, and mux it with "Dialogue:", trailing CRLF, etc. - lavf/assdec: unchanged; it currently still only outputs SSA-lines packets. - lavf/mkv: the demuxer can now output ASS packets without the need of any "SSA-lines" reconstruction hack. It will become the default at next libavformat bump, and the SSA support will be dropped from the demuxer. The muxer can take ASS packets since it's muxed normally, and still supports the old SSA packets. All the SSA support and hacks in Matroska code will be dropped at next lavf bump. [1]: http://www.matroska.org/technical/specs/subtitles/ssa.html
-
Nicolas George authored
-
Nicolas George authored
Try to accept both the old "num:den" and the new "num/den" syntax. Fix "aspect=2" being ignored due to a missing den. Also remove a duplicated #include.
-
Michael Niedermayer authored
* cigaes/master: examples/filtering_audio: fix frame leak. Merged-by: Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
If a reference is unavailable use a field from the current picture Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Paul B Mahol authored
Signed-off-by: Paul B Mahol <onemda@gmail.com>
-
Paul B Mahol authored
Signed-off-by: Paul B Mahol <onemda@gmail.com>
-
Nicolas George authored
The frame is not used after being added to the filter graph, there is no need to keep the reference.
-
Paul B Mahol authored
Signed-off-by: Paul B Mahol <onemda@gmail.com>
-
Michael Niedermayer authored
This occurs also with valid files. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Clément Bœsch authored
It seems browsers don't like it very much.
-
Clément Bœsch authored
-
Clément Bœsch authored
Avoid a pointless split.
-
Clément Bœsch authored
Extension description comments are now placed along the avio calls, the always defined macro removed, and the always true loop_count check as well (loop option is bound to 0-65535).
-
Clément Bœsch authored
-
Clément Bœsch authored
-
Michael Niedermayer authored
Example: Filter overlay Overlay a video source on top of the input. Inputs: #0: main (video) #1: overlay (video) Outputs: #0: default (video) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Carl Eugen Hoyos authored
Fixes ticket #2477.
-
Michael Niedermayer authored
* cehoyos/master: Fix pgc compilation with --disable-optimizations. Merged-by: Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Carl Eugen Hoyos authored
-O1 disables dead code elimination on pgc, use -O instead.
-
- 17 Apr, 2013 12 commits
-
-
Michael Niedermayer authored
No valid samples i found use such copies Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Clément Bœsch authored
-
Clément Bœsch authored
-
Clément Bœsch authored
-
Clément Bœsch authored
-
Clément Bœsch authored
-
Clément Bœsch authored
-
Clément Bœsch authored
-
Clément Bœsch authored
Increase compression when pictures are similar. -f lavfi testsrc=300: 61M -> 21M
-
Clément Bœsch authored
This commit removes the badly duplicated code between the encoder and the muxer. That may sound surprising, but the encoder is now responsible from the encoding of the picture when muxing to a .gif file. It also does not require anymore a manual user intervention such as a -pix_fmt rgb24 to work properly. To summarize, output gif are now easier to generate, code is saner and simpler, and files are smaller (thanks to the lzw encoding which was unused so far with the default .gif output). We can certainly make things even better, but this is the first step. FATE is updated because of the output being produced by the encoder and not the muxer (no lzw in the muxer), and in the seek test only the size mismatches. Fixes Ticket #2262
-
Stefano Sabatini authored
-
Stefano Sabatini authored
-